Просмотр исходного кода

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

gitadmin месяцев назад: 2
Родитель
Сommit
e8c815824e

+ 1 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -61,7 +61,7 @@ public class AFTConstants {
 	/** 运营管理 */
 	public static final String  CALL_MANAGER		            = "9979";
 
-	/** 运营管理 */
+	/** 运营保障 */
 	public static final String  OPERATION_GUARANTEE		            = "9988";
 
 	/**	湖南特批开票*/

+ 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);
 			}
 		}

+ 10 - 10
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -41,23 +41,23 @@ public class PushOrderService {
                 ||TokenManager.hasRole(AFTConstants.SALESMAN_ASSISTANT))&&
                 Objects.equals(TokenManager.getAdminId(), t.getSalesmanId())){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)&& !TokenManager.getAdminId().equals(t.getSalesmanId())){
-            if (TokenManager.getAdminId().equals(t.getManagerId())&&t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
+        }else if (t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
+            if (TokenManager.getAdminId().equals(t.getManagerId())){
                 return  t.getContractPictureUrl();
             }else {
                 return DEFAULTS_URL;
             }
-        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()){
+        }else if (t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()&&TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&(t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode())){
+        }else if (t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()&&TokenManager.hasRole(AFTConstants.FINANCE)){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.OPERATION_GUARANTEE)&&(
-                t.getProcessStatus()== ProcessStatus.YYBZSH.getCode()
-        )){
+        }else if ((t.getProcessStatus()== ProcessStatus.YYBZSH.getCode())&&
+                TokenManager.hasRole(AFTConstants.OPERATION_GUARANTEE)
+        ){
             return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&(
-                t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()||t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode()
-        )){
+        }else if ((t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()||t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode())&&
+                TokenManager.hasRole(AFTConstants.TECH_ADMIN)
+        ){
             return  t.getContractPictureUrl();
         }else if (TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
             return  t.getContractPictureUrl();

+ 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