Merge branch 'v20.6_carrier_station_pound_20240802' into test

performance-web/src/main/java/com/clx/performance/config/LoadAppConfig.java

@@ -18,25 +18,15 @@ public class LoadAppConfig {
     @Autowired
     private AppDao appDao;
 
-    private App purchaseManageApp;
+    private App app;
 
-    private App smartWeightApp;
 
-
-    public App getPurchaseManageApp() {
-        if (purchaseManageApp == null) {
-            purchaseManageApp = appDao.getOneByField(App::getUniqueIdentifier, AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode()).orElseThrow(
-                    PerformanceResultEnum.DATA_NOT_FIND);;
-        }
-        return purchaseManageApp;
-    }
-
-    public App getSmartWeightApp() {
-        if (smartWeightApp == null) {
-            smartWeightApp = appDao.getOneByField(App::getUniqueIdentifier, AppEnum.UniqueIdentifier.SMART_WEIGHT.getCode()).orElseThrow(
+    public App getApp(Integer code) {
+        if (app == null) {
+            app = appDao.getOneByField(App::getUniqueIdentifier, code).orElseThrow(
                     PerformanceResultEnum.DATA_NOT_FIND);
         }
-        return smartWeightApp;
+        return app;
     }
 
 }

performance-web/src/main/java/com/clx/performance/extranal/user/impl/OrderServiceImpl.java

@@ -18,6 +18,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.List;
 import java.util.Map;
 import java.math.BigDecimal;

performance-web/src/main/java/com/clx/performance/job/WeighingOderPictureJob.java

@@ -4,6 +4,7 @@ import com.clx.performance.config.LoadAppConfig;
 import com.clx.performance.config.PerformanceSmartCompanyNoConfig;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderChildWeighPictureDao;
+import com.clx.performance.enums.AppEnum;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.model.App;
 import com.clx.performance.model.OrderChild;
@@ -77,7 +78,7 @@ public class WeighingOderPictureJob{
 
         //查询运单下的电子磅单数据
         if(CollectionUtils.isNotEmpty(orderChilds)){
-            App app = loadAppConfig.getSmartWeightApp();//对接场站配置信息
+            App app = loadAppConfig.getApp(AppEnum.UniqueIdentifier.SMART_WEIGHT.getCode());//对接场站配置信息
             //组装配置信息
             RequestConfig config = new RequestConfig()
                     .setAppId(app.getAppNo())

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1813,7 +1813,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      */
     private SuperviseInfo getSuperviseInfo(String orderNo, String childNo) {
         NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
-        App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
+        App app = appConfig.getApp(AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode());//对接马上来供应链配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
                 .setAppId(app.getAppNo())
@@ -1842,7 +1842,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      */
     private SuperviseInfo getSuperviseInfoWithSubStatus(String orderNo, String childNo, String truckNo) {
         NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
-        App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
+        App app = appConfig.getApp(AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode());//对接马上来供应链配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
                 .setAppId(app.getAppNo())
@@ -3771,7 +3771,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * @return
      */
     public List<WeighingSignatureDto> getWeighingSignature(String childNo){
-        App app = loadAppConfig.getSmartWeightApp();//对接场站配置信息
+        App app = loadAppConfig.getApp(AppEnum.UniqueIdentifier.SMART_WEIGHT.getCode());//对接场站配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
                 .setAppId(app.getAppNo())