承运针对马上来的运单推送给马上来供应链预计时间

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