Browse Source

订单变更BUG修复

anderx 3 years ago
parent
commit
45287c95de

+ 9 - 6
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -269,7 +269,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (nb.getStatus()==4) {
 			throw new BusinessException(new Error( "变更流程已通过审核","变更流程已通过审核"));
 		}
-
+		int x=0;
 		//2通过 3驳回
 		if (status==2) {
 			//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
@@ -299,7 +299,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 								nb.getType()==OrderChangeType.TDTK.getCode()||
 								nb.getType()==OrderChangeType.TDBTK.getCode()){
 							int zxs=orderExamineMapper.checkCountStatus(orderNo,0,null);
-
 							if (zxs>0){
 								nb.setProcessState(OrderChangeProcess.JSY.getCode());
 							}else {
@@ -316,9 +315,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
 						int wsh=orderExamineMapper.checkCountStatus(orderNo,0,0);
 						if (wsh==0){
-							upshZXSJLprocess( nb);
+							x=upshZXSJLprocess( nb);
 						}
-
 					}else if (nb.getProcessState()==OrderChangeProcess.JSJL.getCode()){
 						//咨询师经理审核,将自己审核的全部标记已审核
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
@@ -393,14 +391,18 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 		}
 		addOrderChangeLog(remarks, status, orderNo, nb.getId());
+		if (x>0){
+			addOrderChangeLog("无咨询师经理自动通过", 2, nb.getOrderNo(), nb.getId());
+		}
 		sendNotice(status,nb);
 		pushOrderCangeProcess(nb);
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
 		return 1;
 	}
 
-	private void upshZXSJLprocess(NewOrderChangeBo nb) {
+	private Integer upshZXSJLprocess(NewOrderChangeBo nb) {
 		int zxsjl=orderExamineMapper.checkCountStatus(nb.getOrderNo(),1,null);
+		int x=0;
 		if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||
 				nb.getType()==OrderChangeType.TDTK.getCode()||
 				nb.getType()==OrderChangeType.TDBTK.getCode()||
@@ -409,7 +411,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if (zxsjl>0){
 				nb.setProcessState(OrderChangeProcess.JSJL.getCode());
 			}else {
-				addOrderChangeLog("无咨询师经理自动通过", nb.getStatus(), nb.getOrderNo(), nb.getId());
+				x=1;
 				//重报 没有技术员跳入财务
 				if (nb.getType()==OrderChangeType.CB.getCode()){
 					nb.setProcessState(OrderChangeProcess.CWZY.getCode());
@@ -419,6 +421,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				}
 			}
 		}
+		return x;
 	}
 
 	private void addOrderChangeLog(String remarks, Integer status, String orderNo, Integer id) {