|
|
@@ -512,17 +512,17 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
//如果全部派单完成才需要通知和走下个流程
|
|
|
if (flag){
|
|
|
//如果设置了特定审核需要步入特定审核
|
|
|
- if (aid!=null){
|
|
|
- t.setProcessStatus(ProcessStatus.CWZDSH.getCode());
|
|
|
- List<String> aids = new ArrayList<>();
|
|
|
- aids.add(aid);
|
|
|
- TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
- order.setProcessStatus(ProcessStatus.CWZDSH.getCode());
|
|
|
- pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), use.getApproval());
|
|
|
- }else {
|
|
|
+// if (aid!=null){
|
|
|
+// t.setProcessStatus(ProcessStatus.CWZDSH.getCode());
|
|
|
+// List<String> aids = new ArrayList<>();
|
|
|
+// aids.add(aid);
|
|
|
+// TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
+// order.setProcessStatus(ProcessStatus.CWZDSH.getCode());
|
|
|
+// pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), use.getApproval());
|
|
|
+// }else {
|
|
|
pushNoticeAndEmail(t, use);
|
|
|
|
|
|
- }
|
|
|
+// }
|
|
|
}else {
|
|
|
List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo,0);
|
|
|
StringBuffer str=new StringBuffer();
|