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

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerDetailEnum.java

@@ -66,5 +66,22 @@ public enum SettlementOwnerDetailEnum {
         }
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum PayStatus {
+        NO(0, "否"),
+        YES(1, "是"),
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<PayStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(PayStatus::getMsg).orElse(null);
+        }
+    }
 
 }

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

@@ -23,6 +23,7 @@ public class OrderChildSyncTransportRecordDaoImpl extends BaseDaoImpl<OrderChild
     public List<OrderChildSyncTransportRecord> selectListForJob() {
         return baseMapper.selectList(lQrWrapper()
                 .gt(OrderChildSyncTransportRecord::getCreateTime, LocalDateTime.now().minusMonths(3))
+                .le(OrderChildSyncTransportRecord::getCreateTime, LocalDateTime.now().minusMinutes(6))
                 .eq(OrderChildSyncTransportRecord::getStatus, 0)
         );
     }

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

@@ -48,6 +48,14 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         );
     }
 
+    @Override
+    public boolean updatePayStatus(SettlementOwnerDetail item) {
+        return update(lUdWrapper()
+                .eq(SettlementOwnerDetail::getId, item.getId())
+                .set(SettlementOwnerDetail::getPayStatus, item.getPayStatus())
+        );
+    }
+
     @Override
     public boolean updateSettlementNo(SettlementOwnerDetail item) {
         return update(lUdWrapper()
@@ -169,6 +177,16 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
                 .gt(SettlementOwnerDetail::getCreateTime, LocalDateTime.now().minusMonths(3))
                 .eq(SettlementOwnerDetail::getInvoiceChannel, SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())
                 .eq(SettlementOwnerDetail::getInvoiceStatus, SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())
+                .eq(SettlementOwnerDetail::getPayStatus, SettlementOwnerDetailEnum.PayStatus.YES.getCode())
+                .eq(SettlementOwnerDetail::getInvoiceType, SettlementOwnerEnum.InvoiceType.ONLINE.getCode())
+        );
+    }
+    @Override
+    public List<SettlementOwnerDetail> listPayStatusSync() {
+        return list(lUdWrapper()
+                .gt(SettlementOwnerDetail::getCreateTime, LocalDateTime.now().minusMonths(3))
+                .eq(SettlementOwnerDetail::getInvoiceChannel, SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())
+                .eq(SettlementOwnerDetail::getPayStatus, SettlementOwnerDetailEnum.PayStatus.NO.getCode())
                 .eq(SettlementOwnerDetail::getInvoiceType, SettlementOwnerEnum.InvoiceType.ONLINE.getCode())
         );
     }

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

@@ -22,6 +22,7 @@ import java.util.Set;
 public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailMapper, SettlementOwnerDetail, Integer> {
 
     boolean updateInvoiceType(SettlementOwnerDetail item);
+    boolean updatePayStatus(SettlementOwnerDetail item);
     boolean updateSettlementNo(SettlementOwnerDetail item);
 
     boolean updateInvoiceStatusBySettlementNo(@Param("settlementNo")String settlementNo, @Param("invoiceStatus")Integer invoiceStatus);
@@ -49,4 +50,6 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
     void updateSettlementMerge(String settlementNo, List<String> settlementNos);
 
     List<SettlementOwnerDetail>listInvoiceStatusSync();
+
+    List<SettlementOwnerDetail> listPayStatusSync();
 }

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -62,6 +62,7 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private Integer reportFlag;  //是否上报 0-否;1-是
     private Integer invoiceChannel;                //开票渠道：1无车承运
     private String remark;                              //备注
+    private Integer payStatus;                  //支付状态：0未支付 1已支付（网络货运是否支付）
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -6,14 +6,17 @@ import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.NetworkCaseOutRecordDao;
 import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.dto.PayStatusNotifyDTO;
 import com.clx.performance.enums.NetworkDriverAccountEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
 import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
@@ -56,6 +59,8 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
 
     private final OrderGoodsDao orderGoodsDao;
 
+    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+
     @Override
     public void addOrderChildSyncTransportRecord(SettlementDriverDetail detail) {
         OrderChildSyncTransportRecord record = struct.convertRecord(detail);
@@ -71,7 +76,11 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
         //支付平台服务费
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao
+                .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
+        settlementOwnerDetail.setPayStatus(SettlementOwnerDetailEnum.PayStatus.YES.getCode());
+        settlementOwnerDetailDao.updatePayStatus(settlementOwnerDetail);
         orderChildSyncTransportRecordDao.updateStatus(childNo);
         networkCaseOutRecordDao.updateStatus(payStatusNotifyDTO.getChildNo(),
                 NetworkDriverAccountEnum.CaseOutRecordStatus.PAYED.getCode(),