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

performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java

@@ -118,10 +118,24 @@ public enum OrderChildEnum {
             Status.LOAD.getCode(),
             Status.GO_TO_RECEIVE.getCode(),
             Status.ARRIVE_RECEIVE.getCode(),
-            Status.UNLOAD.getCode()
+            Status.UNLOAD.getCode(),
+            Status.DRIVER_CANCEL.getCode(),
+            Status.PLATFORM_CANCEL.getCode(),
+            Status.OWNER_CANCEL.getCode(),
+            Status.ARTIFICIAL_CANCEL.getCode()
 
     );
 
+    //dts 监听的取消运单
+    public static final List<Integer> DTS_LISTEN_CANCEL_lIST = Arrays.asList(
+            Status.DRIVER_CANCEL.getCode(),
+            Status.PLATFORM_CANCEL.getCode(),
+            Status.OWNER_CANCEL.getCode(),
+            Status.ARTIFICIAL_CANCEL.getCode()
+
+    );
+
+
     // 取消
     public static final List<Integer> CANCEL_lIST = Arrays.asList(
             Status.DRIVER_CANCEL.getCode(),

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

@@ -30,7 +30,7 @@ import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-
+import java.util.Optional;
 
 @Slf4j
 @Component
@@ -69,7 +69,13 @@ public class OrderChildDtsListener  {
                 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())){
@@ -77,8 +83,6 @@ public class OrderChildDtsListener  {
                 log.info("删除:{}"+before);
 
             }
-
-
         } catch (Exception e) {
             log.info("DTS消息同步失败, database:clx_performance.order_child, error:{}", e.getMessage());
         }