ccj 2 years ago
parent
commit
6cec813984

+ 1 - 1
winsea-haixin-platform-backend/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     name: winsea-changchang-project
     name: winsea-changchang-project
   datasource:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     driver-class-name: com.mysql.jdbc.Driver
-    password: Ccj841968545
+    password: Ccj841968545.
     url: jdbc:mysql://47.100.3.209:3306/ylyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
     url: jdbc:mysql://47.100.3.209:3306/ylyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
     username: root
   redis:
   redis:

+ 2 - 2
winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
     time-zone: GMT+8
   profiles:
   profiles:
-    active: local
+    active: prod
   resources:
   resources:
     static-locations: file:///winsea/static/
     static-locations: file:///winsea/static/
   thymeleaf:
   thymeleaf:
@@ -25,7 +25,7 @@ spring:
 #运行环境 1.开发环境 2.测试环境 3.生产环境
 #运行环境 1.开发环境 2.测试环境 3.生产环境
 com:
 com:
   yiliangyiyun:
   yiliangyiyun:
-    env: 1
+    env: 3
 
 
 auth:
 auth:
   anon-methods:
   anon-methods:

+ 3 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PaymentManagementController.java

@@ -185,7 +185,9 @@ public class PaymentManagementController {
             //查询质检表合同号
             //查询质检表合同号
             QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
             QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                     .eq("relation_id",paymentManagement.getRelationId()).eq("delete_flag","0"));
                     .eq("relation_id",paymentManagement.getRelationId()).eq("delete_flag","0"));
-            paymentManagement.setContractNo(qualityInspectionManagement.getContractNo());
+            if(qualityInspectionManagement != null){
+                paymentManagement.setContractNo(qualityInspectionManagement.getContractNo());
+            }
             paymentManagementService.updateById(paymentManagement);
             paymentManagementService.updateById(paymentManagement);
         }
         }
         if(paymentManagementList.size() >0 && !"1".equals(paymentManagementList.get(0).getInvoiceFlag())){
         if(paymentManagementList.size() >0 && !"1".equals(paymentManagementList.get(0).getInvoiceFlag())){