Merge branch 'v20.6_carrier_station_pound_20240802' into dev

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

@@ -18,27 +18,17 @@ public class LoadAppConfig {
     @Autowired
     private AppDao appDao;
 
-    private App purchaseManageApp;
-
-    private App smartWeightApp;
+    private App app;
 
     private App lmsSmartWeightApp;
 
 
-    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;
     }
     public App getLmsSmartWeightApp() {
         if (lmsSmartWeightApp == null) {

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

@@ -17,7 +17,10 @@ public interface OrderService {
 
     Optional<List<String>>   getMonthSameLineOrderList(String orderNo);
 
+
     Optional<Map<String,FeignOrderInfoVO>> queryListOrderByOrderNoList(List<String> orderNoList);
 
     BatchOrderStatisticsInfoDTO queryTaskStatisticsInfo(List<String> orderNoList);
+
+
 }

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

@@ -7,6 +7,7 @@ import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -18,6 +19,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,6 +84,9 @@ public class OrderServiceImpl implements OrderService {
         }
         //计算挂单车数
         for (OrderGoods orderGood : orderGoods) {
+            if(Objects.equals(orderGood.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+                continue;
+            }
             OrderStatisticsInfoDTO dto = result.get(orderGood.getOrderNo());
             dto.setPendingTruckNum(dto.getPendingTruckNum() + orderGood.getNeedTruckNum());
             result.put(orderGood.getOrderNo(),dto);

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

@@ -71,10 +71,13 @@ public class PushOrderChildExpectTimeJob {
                 return;
             }
             Map<String, Integer> orderSourceMap = mapResult.getData();
-            List<OrderChildExpectTimeDTO> syncExpectList = new ArrayList<>();
+            List<OrderChildExpectTimeDTO> syncSmbExpectList = new ArrayList<>();   //同步数媒宝预计时间list
+            List<OrderChildExpectTimeDTO> syncNewOwnerClientExpectList = new ArrayList<>(); //同步马上来供应链预计时间list
+
             list.forEach(item->{
                 //交易平台数媒宝同步运单同步实时预计时间
-                if(Objects.equals(orderSourceMap.get(item.getOrderNo()),SyncPlatformEnum.Source.TRADE_PLATFORM.getCode())){
+                if(Objects.equals(orderSourceMap.get(item.getOrderNo()),SyncPlatformEnum.Source.TRADE_PLATFORM.getCode())
+                || Objects.equals(orderSourceMap.get(item.getOrderNo()),SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode())){
                     List<OrderChildExpectDTO> expectList = orderChildService.getOrderChildExpect(
                             item.getChildNo());
                     if(CollectionUtils.isEmpty(expectList) ||  StringUtils.isBlank(expectList.get(0).getCreateTime())){
@@ -99,23 +102,35 @@ public class PushOrderChildExpectTimeJob {
                     }else{    //到达货源地之后 && 到达目的地之前
                         dto.setExpectReceiveTime(orderChildExpect.getExpectReceiveTime());
                     }
-                    syncExpectList.add(dto);
+                    if(Objects.equals(orderSourceMap.get(item.getOrderNo()),SyncPlatformEnum.Source.TRADE_PLATFORM.getCode())){
+                        syncSmbExpectList.add(dto);
+                    }else{
+                        syncNewOwnerClientExpectList.add(dto);
+                    }
                 }
             });
-            if(CollectionUtils.isNotEmpty(syncExpectList)){
+            if(CollectionUtils.isNotEmpty(syncSmbExpectList)){
                 OrderChildExpectTimeMessage message = new OrderChildExpectTimeMessage();
-                message.setList(syncExpectList);
+                message.setList(syncSmbExpectList);
                 String data = JSON.toJSONString(message);
                 OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(
                         SyncPlatformEnum.Source.TRADE_PLATFORM.getCode().toString());
-                log.info("运单预计时间信息同步开始，请求参数:{}",data);
+                log.info("数媒宝=====》运单预计时间信息同步开始，请求参数:{}",data);
                 Result<?> result = openCallBackClient.encryptPost(data,message.topic());
-                log.info("运单预计时间信息同步，响应结果:{}",JSON.toJSONString(result));
+                log.info("数媒宝=====》运单预计时间信息同步，响应结果:{}",JSON.toJSONString(result));
             }
-        }
-
-
 
+            if(CollectionUtils.isNotEmpty(syncNewOwnerClientExpectList)){
+                OrderChildExpectTimeMessage message = new OrderChildExpectTimeMessage();
+                message.setList(syncNewOwnerClientExpectList);
+                String data = JSON.toJSONString(message);
+                OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(
+                        SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode().toString());
+                log.info("马上来供应链=====》运单预计时间信息同步开始，请求参数:{}",data);
+                Result<?> result = openCallBackClient.encryptPost(data,message.topic());
+                log.info("马上来供应链=====》运单预计时间信息同步，响应结果:{}",JSON.toJSONString(result));
+            }
+        }
     }
 
 }

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

@@ -1821,6 +1821,9 @@ public class OrderChildServiceImpl implements OrderChildService {
      */
     private SuperviseInfo getSuperviseInfo(String orderNo, int type) {
         App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
+    private SuperviseInfo getSuperviseInfo(String orderNo, String childNo) {
+        NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
+        App app = appConfig.getApp(AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode());//对接马上来供应链配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
                 .setAppId(app.getAppNo())
@@ -1849,7 +1852,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())
@@ -3785,7 +3788,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())