Selaa lähdekoodia

Merge branch 'test' of jishutao/kede-server into prod

anderx 6 vuotta sitten
vanhempi
commit
80edf0615c

+ 4 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -203,6 +203,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					 } 
 					 nb.setProcessState(nb.getProcessState()+1);
 					}
+				 if(nb.getProcessState()==4) {//必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
+					 nb.setProcessState(nb.getProcessState()+1);
+				 }
 				 if(nb.getProcessState()==2){//咨询师
 						//找出当时人的审核改为通过
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
@@ -219,7 +222,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							nb.setProcessState(nb.getProcessState()+1);
 						}
 					}
-				 if(nb.getProcessState()==4||nb.getProcessState()==5||nb.getProcessState()==6) {
+				 if(nb.getProcessState()==5||nb.getProcessState()==6) {
 						nb.setProcessState(nb.getProcessState()+1);
 					}
 			}

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -370,6 +370,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	
 
 	public void addOrderLog(TOrderLog tl) {
+		tl.setAid(TokenManager.getAdminId());
 		tOrderLogMapper.insertSelective(tl);
 		
 	}