Browse Source

订单变更BUG修复

anderx 3 years ago
parent
commit
182b0e153d

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

@@ -303,7 +303,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 								nb.setProcessState(OrderChangeProcess.JSY.getCode());
 							}else {
 								addOrderChangeLog("无咨询师自动通过", status, orderNo, nb.getId());
-								upshZXSJLprocess(nb);
+								pushZXSJLprocess(nb);
 							}
 						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
 							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
@@ -311,12 +311,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							nb.setProcessState(OrderChangeProcess.CWZY.getCode());
 						}
 					}else if (nb.getProcessState()==OrderChangeProcess.JSY.getCode()){
+						x=pushZXSprocess(nb);
 						//咨询师审核,将自己审核的全部标记已审核
-						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
-						int wsh=orderExamineMapper.checkCountStatus(orderNo,0,0);
-						if (wsh==0){
-							x=upshZXSJLprocess( nb);
-						}
 					}else if (nb.getProcessState()==OrderChangeProcess.JSJL.getCode()){
 						//咨询师经理审核,将自己审核的全部标记已审核
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
@@ -376,18 +372,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				nb.setBackStatus(processState);
 			}
 			//驳回位置查看有无审核人,没有则直接跳下一个
-			if (rejectState==2) {
-				if (orderExamineMapper.checkCountStatus(orderNo,0,null)<1) nb.setProcessState(nb.getProcessState()+1);
+			if (rejectState<=3) {
+				orderExamineMapper.updateByOrderNo(orderNo,1);
 			}
 			if (rejectState==3) {
-				if (orderExamineMapper.checkCountStatus(orderNo,1,null)<1) nb.setProcessState(nb.getProcessState()+1);
-			}
-
-			//如果驳回到技术经理之前则将审核表中状态跳回
-			if(nb.getProcessState()==3) {
-				orderExamineMapper.updateByOrderNo(orderNo,1);
-			}else if (nb.getProcessState()<3) {
-				orderExamineMapper.updateByOrderNo(orderNo,null);
+				x=pushZXSprocess(nb);
+			}else if(rejectState==4){
+				x=pushZXSJLprocess(nb);
 			}
 		}
 		addOrderChangeLog(remarks, status, orderNo, nb.getId());
@@ -400,7 +391,26 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return 1;
 	}
 
-	private Integer upshZXSJLprocess(NewOrderChangeBo nb) {
+	/**
+	 *  判断zxs是否全审核,全审核就去判断咨询师经理,跳过就返回x=1,在后续添加日志放到先审核,后添加日志
+	 * @param nb
+	 * @return
+	 */
+	private int pushZXSprocess(NewOrderChangeBo nb) {
+		orderExamineMapper.updateByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId(),0);
+		int wsh=orderExamineMapper.checkCountStatus(nb.getOrderNo(),0,0);
+		if (wsh==0){
+			return pushZXSJLprocess( nb);
+		}
+		return 0;
+	}
+
+	/**
+	 * 咨询师经理,跳过就返回x=1,在后续添加日志放到先审核,后添加日志
+	 * @param nb
+	 * @return
+	 */
+	private Integer pushZXSJLprocess(NewOrderChangeBo nb) {
 		int zxsjl=orderExamineMapper.checkCountStatus(nb.getOrderNo(),1,null);
 		int x=0;
 		if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||