Browse Source

修改订单如果超过10万,需要新增中间表

anderx 2 months ago
parent
commit
b938e35549

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

@@ -548,6 +548,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 		//订单提交
 		if (isSubmit==1) {
+
 			t2.setApproval(t.getApproval());
 			addOrderLog(t2.getOrderNo(),OrderLogProcess.TJ.getCode(), null);
 			if(t2.getProcessStatus()<ProcessStatus.YPYXJL.getCode()) {
@@ -1058,7 +1059,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (flag){
 			int x=userMidMapper.updateByUid(um);
 			if (x==0) {
-				um.setAid(t.getSalesmanId());
+				um.setAid(TokenManager.getAdminId());
 				userMidMapper.insertSelective(um);
 			}
 		}

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

@@ -1,7 +1,7 @@
 dev.name=local
 spring.main.lazy-initialization=true
 jdbc.driverClassName=com.mysql.jdbc.Driver
-kede.version=1.3.44
+kede.version=1.3.46
 static.host=//static.jishutao.com/${kede.version}
 #static.host=//172.16.1.199:3000/${kede.version}
 #static.host=//172.16.1.187/${kede.version}

+ 2 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,6 @@
 dev.name=test
-static.host=//static.jishutao.com/1.3.44
+kede.version=1.3.46
+static.host=//static.jishutao.com/${kede.version}
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false