ccj 2 年之前
父节点
当前提交
39ffad58e6

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

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

+ 2 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1718,11 +1718,11 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
                     warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
                     warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
-                    if ("潮粮".contains(dataList1.get(j).getGoodsName())) {
+                    if (dataList1.get(j).getGoodsName().contains("潮粮")) {
                         //单价=(潮粮单价-扣单价)*1000
                         warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
                     } else {
-                        warehousingOrder1.setPrice((dataList1.get(j).getSolidGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
+                        warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
                     }
                 }
             }