Bläddra i källkod

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

anderx 6 år sedan
förälder
incheckning
ace5865940

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

@@ -203,7 +203,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					 } 
 					 nb.setProcessState(nb.getProcessState()+1);
 					}
-				 if(nb.getProcessState()==4) {//必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
+				 //必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
+				 if(nb.getProcessState()==4||nb.getProcessState()==5||nb.getProcessState()==6) {
 					 nb.setProcessState(nb.getProcessState()+1);
 				 }
 				 if(nb.getProcessState()==2){//咨询师
@@ -222,9 +223,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							nb.setProcessState(nb.getProcessState()+1);
 						}
 					}
-				 if(nb.getProcessState()==5||nb.getProcessState()==6) {
-						nb.setProcessState(nb.getProcessState()+1);
-					}
+				
 			}
 			/*else {
 				if(nb.getProcessState()==9) {

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.26
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com/1.1.26
+#avatar.host=//sb.jishutao.com
 
 #连测试
-#avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.26
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.26
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload