Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into…

performance-web/src/main/java/com/clx/performance/enums/PayRemarkEnum.java

@@ -23,6 +23,10 @@ public enum PayRemarkEnum {
     DRIVER_SALE_UNFREEZE(13, "司机支付货款给货主"),
     //v78 解冻保险
     UNFREEZE_INSURANCE(14, "解冻保险"),
+    //v78 解冻保险
+    OWNER_PAY_DRIVER_INSURANCE(15, "货主取消订单赔偿金"),
+    DRIVER_PAY_OWNER_DRIVER_INSURANCE(16, "司机取消订单赔偿金"),
+
     ;
 
     private static Map<Integer, String> map = new ConcurrentHashMap<>();

performance-web/src/main/java/com/clx/performance/service/impl/payment/PayServiceImpl.java

@@ -31,7 +31,7 @@ public class PayServiceImpl implements PayService {
     public void driverPay(String settlementNo, Long driverUserNo, Integer figure) {
         DriverInfoFeignVo driverInfoFeignVo = driverService.getDriverInfo(driverUserNo).orElseThrow(ResultCodeEnum.FAIL);
 
-        pay(driverInfoFeignVo.getWalletCode(), mslPaymentConfig.getTransportWalletCode(), figure, settlementNo, PayRemarkEnum.toString(PayRemarkEnum.COMPENSATION_TO_DRIVER.getValue()));
+        pay(driverInfoFeignVo.getWalletCode(), mslPaymentConfig.getTransportWalletCode(), figure, settlementNo, PayRemarkEnum.toString(PayRemarkEnum.DRIVER_PAY_OWNER_DRIVER_INSURANCE.getValue()));
 
     }
 
@@ -42,7 +42,7 @@ public class PayServiceImpl implements PayService {
     public void payDriver(String settlementNo, Long driverUserNo, Integer figure) {
         DriverInfoFeignVo driverInfoFeignVo = driverService.getDriverInfo(driverUserNo).orElseThrow(ResultCodeEnum.FAIL);
 
-        pay(mslPaymentConfig.getTransportWalletCode(), driverInfoFeignVo.getWalletCode(), figure, settlementNo, PayRemarkEnum.toString(PayRemarkEnum.COMPENSATION_TO_DRIVER.getValue()));
+        pay(mslPaymentConfig.getTransportWalletCode(), driverInfoFeignVo.getWalletCode(), figure, settlementNo, PayRemarkEnum.toString(PayRemarkEnum.OWNER_PAY_DRIVER_INSURANCE.getValue()));
     }
 
     /**

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

@@ -198,15 +198,28 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
      */
     private void paySettlementDriver(SettlementDriverDetail detail){
         DriverInfoFeignVo driverInfoFeignVo = driverService.getDriverInfo(detail.getDriverUserNo()).orElseThrow(ResultCodeEnum.FAIL);
-        PayParam noCheckPwd = PayParam.builder().from(
-                        Integer.valueOf(mslPaymentConfig.getTransportWalletCode()))
-                .to(Integer.valueOf(driverInfoFeignVo.getWalletCode()))
-                .figure(detail.getSettlementFreight().intValue())
-                .tradeNo(detail.getChildNo())
-                .tradeId(detail.getChildNo())
-                .pwd("noCheckPwd")
-                .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
-                .build();
+        PayParam noCheckPwd = null ;
+        if(detail.getSettlementFreight().compareTo(BigDecimal.ZERO) > 0){
+            noCheckPwd = PayParam.builder().from(mslPaymentConfig.getTransportWalletCode())
+                    .to(driverInfoFeignVo.getWalletCode())
+                    .figure(detail.getSettlementFreight().intValue())
+                    .tradeNo(detail.getChildNo())
+                    .tradeId(detail.getChildNo())
+                    .pwd("noCheckPwd")
+                    .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
+                    .build();
+        }else{
+            BigDecimal freight = detail.getSettlementFreight().abs();
+            noCheckPwd = PayParam.builder().from(driverInfoFeignVo.getWalletCode())
+                    .to(mslPaymentConfig.getTransportWalletCode())
+                    .figure(freight.intValue())
+                    .tradeNo(detail.getChildNo())
+                    .tradeId(detail.getChildNo())
+                    .pwd("noCheckPwd")
+                    .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
+                    .build();
+        }
+
         Result result = null;
         try{
             result = paymentService.paymentWallet(noCheckPwd);