Browse Source

Merge remote-tracking branch 'origin/test' into dev

anderx 6 years ago
parent
commit
3628ca6fc6

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

@@ -200,6 +200,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				 if(nb.getProcessState()==1){//营销管理通过则设置技术管理员通过表
 					 if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
 						 insertOrderExamine(orderNo);
+						 nb.setProcessState(nb.getProcessState()+1);
 					 } 
 					}
 				 if(nb.getProcessState()==2){//咨询师
@@ -217,7 +218,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						if (orderExamineMapper.checkCountStatus(orderNo,1,0)<1) {
 							nb.setProcessState(nb.getProcessState()+1);
 						}
-					}else if(nb.getProcessState()!=7&&nb.getProcessState()!=8) {
+					}
+				 if(nb.getProcessState()==5||nb.getProcessState()==6) {
 						nb.setProcessState(nb.getProcessState()+1);
 					}
 			}