Merge branch 'v6.4_transportation_20231110' of…

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);