Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum OrderChildSyncTransportRecordEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        INIT(0, "未同步"),
+        SYNC(1, "已同步"),
+        SUC(2, "回调成功"),
+        FAIL(3, "回调失败"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Status::getMsg).orElse(null);
+        }
+    }
+
+}

performance-web/src/main/java/com/clx/performance/dao/impl/settle/OrderChildSyncTransportRecordDaoImpl.java

@@ -4,7 +4,7 @@ package com.clx.performance.dao.impl.settle;
 import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
 import com.clx.performance.mapper.settle.OrderChildSyncTransportRecordMapper;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
-import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
@@ -33,4 +33,13 @@ public class OrderChildSyncTransportRecordDaoImpl extends BaseDaoImpl<OrderChild
                 .set(OrderChildSyncTransportRecord::getStatus, 2)
         );
     }
+
+    @Override
+    public Optional<OrderChildSyncTransportRecord> getByChildNo(String childNo) {
+        return Optional.of(childNo)
+                .map(item -> lQrWrapper()
+                        .eq(OrderChildSyncTransportRecord::getChildNo, item)
+                )
+                .map(super::getOne);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/OrderChildSyncTransportRecordDao.java

@@ -3,6 +3,7 @@ package com.clx.performance.dao.settle;
 
 import com.clx.performance.mapper.settle.OrderChildSyncTransportRecordMapper;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
 import java.util.List;
@@ -18,4 +19,7 @@ public interface OrderChildSyncTransportRecordDao extends BaseDao<OrderChildSync
     List<OrderChildSyncTransportRecord> selectListForJob();
 
     void updateStatus(String childNo);
+
+    Optional<OrderChildSyncTransportRecord> getByChildNo(String childNo);
+
 }

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

@@ -121,6 +121,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private SettlementMqService settlementMqService;
 
+    @Autowired
+    private OrderChildSyncTransportRecordDao orderChildSyncTransportRecordDao;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void settlementStatistics(SettlementStatisticsMqParam mq) {
@@ -213,6 +216,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriverDetailDao.updateSettlementNo(settlementDriverDetail);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void settle(SettlementSettleMqParam mq) {
         OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).get();
@@ -223,6 +227,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         orderChildSyncTransportListener.extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, mq.getInvoiceType(), mq.getRemark());
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void invoiceTypeSync(SettlementInvoiceTypeSyncMqParam mq) {
         OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -273,6 +278,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void invoiceStatusSync(SettlementInvoiceStatusSyncMqParam mq) {
         OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -298,6 +304,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void payStatusSync(SettlementPayStatusSyncMqParam mq) {
         OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -307,6 +314,13 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             return;
         }
 
+        OrderChildSyncTransportRecord orderChildSyncTransportRecord = orderChildSyncTransportRecordDao
+                .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if (!Objects.equals(orderChildSyncTransportRecord.getStatus(),
+                OrderChildSyncTransportRecordEnum.Status.INIT.getCode())){
+            return;
+        }
+
         // 获取状态
         TransportVO result = brokerService.getOrderChildStatus(mq.getChildNo());
         if (result == null){