Merge remote-tracking branch 'origin/v6.2_sync_trade_20231102' into test

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.clx.open.sdk.callback.OpenCallBackClient;
 import com.clx.open.sdk.callback.message.OrderChildMessage;
 import com.clx.open.sdk.enums.ResultStatusEnum;
+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;
@@ -68,14 +69,6 @@ public class OrderChildDtsListener  {
             }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 log.info("修改:{}"+after);
                 if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) && !Objects.equals(before.getStatus(),after.getStatus())){
-                    //同步after数据
-                    Optional<OrderChildEnum.Status> option = OrderChildEnum.Status.getByCode(after.getStatus());
-                    String statusName = option.isPresent()?option.get().getName():"未知状态";
-                    log.info("同步运单数据，运单号:{},运单状态:{}",after.getChildNo(),statusName);
-                    //如果订单是取消操作，同步给交易平台统一 10000 的code
-                    if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
-                        after.setStatus(10000);
-                    }
                     orderChildChangeAfter(after);
                 }
             }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
@@ -93,6 +86,16 @@ public class OrderChildDtsListener  {
         if (orderInfoFeign == null) {
             return;
         }
+        //同步交易平台的运单
+        if(Objects.equals(orderInfoFeign.getOrderSource(), SyncPlatformEnum.TRADE_PLATFORM.getCode())){
+            //同步after数据
+            Optional<OrderChildEnum.Status> option = OrderChildEnum.Status.getByCode(after.getStatus());
+            String statusName = option.isPresent()?option.get().getName():"未知状态";
+            log.info("同步运单数据，运单号:{},运单状态:{}",after.getChildNo(),statusName);
+            //如果订单是取消操作，同步给交易平台统一 10000 的code
+            if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
+                after.setStatus(10000);
+            }
             after.setLastFlag(ResultStatusEnum.NO.getCode());
             long nowTimeMillis = System.currentTimeMillis();
             LocalDateTime nowDateTime = new Date(nowTimeMillis).toInstant().atOffset(ZoneOffset.of("+8")).toLocalDateTime();
@@ -108,9 +111,9 @@ public class OrderChildDtsListener  {
                 }
             }
             OpenCallBackClient client = new OpenCallBackClient(mslAppConfig.getUrl(),mslAppConfig.getAppId(),mslAppConfig.getSecret());
-        Result result = client.encryptPost(JSON.toJSONString(after),after.topic());
-        log.info("订单信息同步，运单编号:{},响应结果:{}",after.getChildNo(),JSON.toJSONString(result));
-
+            Result<?> result = client.encryptPost(JSON.toJSONString(after),after.topic());
+            log.info("运单信息同步，运单编号:{},响应结果:{}",after.getChildNo(),JSON.toJSONString(result));
+        }
     }
 
 }