Browse Source

营销管理员跳过审核BUG修复

anderx 2 years ago
parent
commit
1d0bc1a9d9

+ 6 - 7
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -590,13 +590,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 			}else  if (t.getProcessStatus()==ProcessStatus.YPCW_JSZJ.getCode()){
 				type=NoticeStatus.ORDER_YES.getCode();
-				Department dep = departmentMapper.selectByPrimaryKey(t.getOrderDep());
-				aids.add(dep.getFinanceId());
-				Admin finance = adminMapper.selectByPrimaryKey(dep.getFinanceId());
-				str=str.append(finance.getName()).append(",");
+				//为了防止中间加或者删除复审,在营销管理员审核的时候重新刷新
+				List<TOrderExamine> tOrderExamines1 = addTOrderExamines(t2);
+				for (TOrderExamine e : tOrderExamines1) {
+					aids.add(e.getAid());
+					str=str.append(e.getAname()).append(",");
+				}
 			}
-
-
 			if (str.length()>0)t.setExamineName(str.substring(0,str.length()-1));
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 			pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t.getApproval());
@@ -1114,7 +1114,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				Admin admin=adminMapper.selectFinanceAdminByOrderDep(t2.getOrderDep());
 				updateFinanceCount(admin.getId(),t2.getCreateTime());
 			}
-
 			type=NoticeStatus.ORDER_YES.getCode();
 			//增加日志
 			addOrderLog(tl,reason);