Просмотр исходного кода

重报咨询师经理审核BUG修复

anderx лет назад: 3
Родитель
Сommit
599bd6b9de

+ 17 - 8
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -292,7 +292,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 								nb.setProcessState(OrderChangeProcess.JSY.getCode());
 							}else {
 								zxsFlag=true;
-
 								pushZXSJLprocess(nb);
 							}
 						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
@@ -308,7 +307,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
 						int wsh=orderExamineMapper.checkCountStatus(orderNo,1,0);
 						if (wsh==0){
-							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
+							zxsjlFlag=pushZXSJLprocess(nb);
 						}
 					}else if (nb.getProcessState()==OrderChangeProcess.JSZJ.getCode()){
 						nb.setProcessState(OrderChangeProcess.CWZY.getCode());
@@ -373,12 +372,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 		}
 		addOrderChangeLog(remarks, status, orderNo, nb.getId());
-		if (zxsFlag){
-			addOrderChangeLog("无咨询师自动通过", status, orderNo, nb.getId());
-		}
-		if (zxsjlFlag){
-			addOrderChangeLog("无咨询师经理自动通过", 2, nb.getOrderNo(), nb.getId());
+		if (zxsFlag||zxsjlFlag){
+			Date date =new Date();
+			date.setTime(date.getTime()+1000);
+			if (zxsFlag){
+				addOrderChangeLog("无咨询师自动通过", status, orderNo, nb.getId(),date);
+			}
+			if (zxsjlFlag){
+				addOrderChangeLog("无咨询师经理自动通过", 2, nb.getOrderNo(), nb.getId(),date);
+			}
 		}
+
 		sendNotice(status,nb);
 		pushOrderCangeProcess(nb);
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
@@ -429,13 +433,18 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id) {
+		addOrderChangeLog(remarks,status,orderNo,id,null);
+	}
+
+	private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id,Date date) {
+		if (date ==null)date=new Date();
 		OrderChangeLog ocl = new OrderChangeLog();
 		ocl.setAuditor(TokenManager.getAdminId());
 		ocl.setOrderNo(orderNo);
 		ocl.setRemarks(remarks);
 		ocl.setChangeId(id);
 		ocl.setStatus(status);
-		ocl.setCreateTime(new Date());
+		ocl.setCreateTime(date);
 		orderChangeLogMapper.insertSelective(ocl);
 	}