Merge branch 'v6.4_transportation_20231110' into test

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverVO.java

@@ -62,6 +62,9 @@ public class PageCarrierBreakContractSettlementDriverVO {
     @ApiModelProperty("结算时间")
     private String settleTime;
 
+    @ApiModelProperty("支付备注")
+    private String payRemark;
+
     @ApiModelProperty("操作人名称")
     private String createName;
 

performance-web/src/main/java/com/clx/performance/controller/payment/PayNotifyController.java

@@ -61,7 +61,7 @@ public class PayNotifyController {
             // 支付失败处理
             log.info("支付失败处理 唯一id {}", notify.getOrderNo());
         } else {
-            breakContractMqHandlerService.payFail(notify.getOrderNo());
+            breakContractMqHandlerService.payFail(notify.getOrderNo(), notify.getMsg());
 
             // 支付支付成功处理
             log.info(" 支付支付成功处理 唯一id {}", notify.getOrderNo());

performance-web/src/main/java/com/clx/performance/dao/breakcontract/BreakContractSettlementDriverDao.java

@@ -20,6 +20,8 @@ public interface BreakContractSettlementDriverDao extends BaseDao<BreakContractS
 
     boolean updateSettlementStatus(BreakContractSettlementDriver item);
 
+    boolean updatePayFail(BreakContractSettlementDriver item);
+
     Optional<BreakContractSettlementDriver> selectBySettlementNo(String settlementNo);
 
     IPage<BreakContractSettlementDriver> pageCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param);

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementDriverDaoImpl.java

@@ -34,6 +34,14 @@ public class BreakContractSettlementDriverDaoImpl extends BaseDaoImpl<BreakContr
         );
     }
 
+    @Override
+    public boolean updatePayFail(BreakContractSettlementDriver item) {
+        return update(lUdWrapper()
+                .eq(BreakContractSettlementDriver::getId, item.getId())
+                .set(BreakContractSettlementDriver::getPayRemark, item.getPayRemark())
+        );
+    }
+
     @Override
     public Optional<BreakContractSettlementDriver> selectBySettlementNo(String settlementNo) {
         return Optional.of(settlementNo)

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementDriver.java

@@ -79,6 +79,10 @@ public class BreakContractSettlementDriver  implements HasKey<Integer> {
     @ApiModelProperty("结算时间")
     private LocalDateTime settleTime;
 
+    @TableField("pay_remark")
+    @ApiModelProperty("支付备注")
+    private String payRemark;
+
     @TableField("create_by")
     @ApiModelProperty("操作人编号")
     private Long createBy;

performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractMqHandlerService.java

@@ -10,6 +10,7 @@ public interface BreakContractMqHandlerService {
     void driverRecordAdd(BreakContractDriverRecordAddMqParam mq);
 
     void paySuccess(String settlementNo);
-    void payFail(String settlementNo);
+
+    void payFail(String settlementNo, String remark);
 
 }

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

@@ -173,14 +173,18 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler
     }
 
     @Override
-    public void payFail(String settlementNo) {
-        log.info("违约结算单支付失败回调, settlementNo:{}", settlementNo);
+    public void payFail(String settlementNo, String remark) {
+        log.info("违约结算单支付失败回调, settlementNo:{}, remark:{}", settlementNo, remark);
         BreakContractSettlementDriver breakContractSettlementDriver = breakContractSettlementDriverDao.selectBySettlementNo(settlementNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         if (Objects.equals(breakContractSettlementDriver.getSettleStatus(), BreakContractSettlementDriverEnum.SettleStatus.YES.getCode())){
             log.info("违约结算单支付失败回调, 结算单已支付, settlementNo:{}", settlementNo);
             return;
         }
+
+        breakContractSettlementDriver.setPayRemark(remark);
+        breakContractSettlementDriverDao.updatePayFail(breakContractSettlementDriver);
+
     }
 
 }