Merge branch 'v1.0_init_contract_20240306' into dev

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

-package com.clx.performance.config;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-
-@Configuration
-@Getter
-@Setter
-public class MslAppConfig {
-
-    @Value("${msl.supervise.trade.appid}")
-    private String appId;
-    @Value("${msl.supervise.trade.url}")
-    private String url;
-    @Value("${msl.supervise.trade.secret}")
-    private String secret;
-}

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -9,7 +9,6 @@ import com.clx.order.enums.OrderEnum;
 import com.clx.order.enums.SyncPlatformEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignOrderVO;
-import com.clx.performance.config.MslAppConfig;
 import com.clx.performance.config.ThirdAppConfig;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dto.dts.DataTransportDTO;
@@ -38,7 +37,6 @@ import java.util.Optional;
 @Component
 @AllArgsConstructor
 public class OrderChildDtsListener  {
-    private final MslAppConfig mslAppConfig;
     private final OrderFeign orderFeign;
     private final LastTruckService lastTruckService;
     private final DriverService driverService;
@@ -110,10 +108,10 @@ public class OrderChildDtsListener  {
                 after.setStatus(com.clx.open.sdk.enums.OrderChildEnum.Status.COMMON_CANCEL.getCode());
             }
             after.setLastFlag(ResultStatusEnum.NO.getCode());
-            OpenCallBackClient client = new OpenCallBackClient(mslAppConfig.getUrl(),mslAppConfig.getAppId(),mslAppConfig.getSecret());
-            Result<?> result = client.encryptPost(JSON.toJSONString(after),after.topic());
+            String data = JSON.toJSONString(after);
+            OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(orderInfoFeign.getOrderSource().toString());
+            Result<?> result = openCallBackClient.encryptPost(data,after.topic());
             log.info("运单信息同步，运单编号:{},响应结果:{}",after.getChildNo(),JSON.toJSONString(result));
-
             syncLastTruck(orderInfoFeign,after);
 
         }
@@ -143,14 +141,14 @@ public class OrderChildDtsListener  {
      * 第三方同步
      */
     public void thirdpartySync(OrderChildSyncMessage message){
-//        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign("");
-//        if (orderInfoFeign == null) {
-//            return;
-//        }
-//        // 同步新货主客户端的运单
-//        if(!Objects.equals(orderInfoFeign.getOrderSource(), SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode())){
-//
-//        }
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(message.getOrderNo());
+        if (orderInfoFeign == null) {
+            return;
+        }
+        // 同步新货主客户端的运单
+        if(!Objects.equals(orderInfoFeign.getOrderSource(), SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode())){
+            return;
+        }
 
         try{
             OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode().toString());

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

@@ -6,7 +6,7 @@ import com.clx.open.sdk.callback.message.OrderChildMessage;
 import com.clx.open.sdk.enums.ResultStatusEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignOrderVO;
-import com.clx.performance.config.MslAppConfig;
+import com.clx.performance.config.ThirdAppConfig;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.LastTruckService;
@@ -34,7 +34,7 @@ public class LastTruckServiceImpl implements LastTruckService {
     private final OrderFeign orderFeign;
     private final OrderChildDao orderChildDao;
     private final OrderChildStruct orderChildStruct;
-    private final MslAppConfig mslAppConfig;
+    private final ThirdAppConfig thirdAppConfig;
     /**
      * @Author kavin
      * @Description 判断最后一车的逻辑
@@ -68,13 +68,15 @@ public class LastTruckServiceImpl implements LastTruckService {
      **/
     @Override
     public Result<?> syncLastTruckChild(OrderChild child) {
+        FeignOrderVO orderInfo = orderFeign.getOrderInfoFeign(child.getOrderNo());
         OrderChildMessage message = orderChildStruct.convertMessage(child);
         message.setLastFlag(ResultStatusEnum.YES.getCode());
-        log.info("开始同步最后一车的运单，运单编号:{},运单信息:{}",child.getChildNo(), JSON.toJSONString(message));
-        OpenCallBackClient client2 = new OpenCallBackClient(mslAppConfig.getUrl(),mslAppConfig.getAppId(),mslAppConfig.getSecret());
-        Result<?> result2 = client2.encryptPost(JSON.toJSONString(message),message.topic());
-        log.info("结束同步最后一车的运单，运单编号:{}，响应结果:{}",child.getChildNo(),JSON.toJSONString(result2));
-        return result2;
+        String data = JSON.toJSONString(message);
+        log.info("开始同步最后一车的运单，运单编号:{},运单信息:{}",child.getChildNo(), data);
+        OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(orderInfo.getOrderSource().toString());
+        Result<?> result = openCallBackClient.encryptPost(data,message.topic());
+        log.info("结束同步最后一车的运单，运单编号:{}，响应结果:{}",child.getChildNo(),JSON.toJSONString(result));
+        return result;
     }
 
     @Override