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

performance-web/src/main/java/com/clx/performance/extranal/user/DriverService.java

@@ -13,4 +13,6 @@ public interface DriverService {
 
     Optional<DriverInfoFeignVo> getTruckOwnInfo(String truckNo);
 
+    Optional<DriverInfoFeignVo> getDriverInfo(Long driverUserNo);
+
 }

performance-web/src/main/java/com/clx/performance/extranal/user/impl/DriverServiceImpl.java

@@ -44,4 +44,14 @@ public class DriverServiceImpl implements DriverService {
         return null;
     }
 
+
+    @Override
+    public Optional<DriverInfoFeignVo> getDriverInfo(Long driverUserNo) {
+        Result<DriverInfoFeignVo> result = Optional.ofNullable(driverFeign.getDriverInfo(driverUserNo)).filter(Result::succeed).orElseThrow(ResultCodeEnum.FAIL);
+        if (!Objects.equals(result.getCode(), 0)){
+            throw new ServiceSystemException(ResultCodeEnum.FAIL, result.getMsg());
+        }
+        return Optional.ofNullable(result.getData());
+    }
+
 }

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

@@ -5,16 +5,20 @@ import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.OrderChildLogEnum;
+import com.clx.performance.enums.PayRemarkEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.enums.settle.SettlementLogEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementPlatformEnum;
+import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.pc.payment.PayParam;
+import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
 import com.clx.performance.service.settle.SettlementLogService;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
@@ -22,7 +26,9 @@ import com.clx.performance.service.settle.SettlementService;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.vo.mq.SettlementDetailAddMqParam;
 import com.clx.performance.vo.mq.SettlementDetailInvoiceTypeSyncMqParam;
+import com.clx.user.vo.feign.DriverInfoFeignVo;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
+import com.msl.common.enums.ResultCodeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +39,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 @Slf4j
 @Service
@@ -59,6 +66,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private  SettlementLogService settlementLogService;
 
+    @Autowired
+    private DriverService driverService;
+
+    @Autowired
+    private PaymentService paymentService;
+
 
 
     @Override
@@ -96,6 +109,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         settlementDriverSave(settlementDriverDetail,settlementNo);
 
+        //车主结算单自动支付
+        paySettlementDriver(settlementDriverDetail);
+
         // 更新结算单
         settlementOwnerDetail.setSettlementNo(settlementNo);
         settlementDriverDetail.setSettlementNo(settlementNo);
@@ -140,6 +156,23 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriverDao.saveEntity(settlementDriver);
     }
 
+    /**
+     * 车主结算单自动支付
+     */
+    private void paySettlementDriver(SettlementDriverDetail detail){
+        DriverInfoFeignVo driverInfoFeignVo = driverService.getDriverInfo(detail.getDriverUserNo()).orElseThrow(ResultCodeEnum.FAIL);
+        PayParam noCheckPwd = PayParam.builder().from(
+                        Integer.valueOf("100012896"))
+                .to(Integer.valueOf(driverInfoFeignVo.getWalletCode()))
+                .figure(detail.getSettlementFreight().intValue())
+                .tradeNo(UUID.randomUUID().toString().replaceAll("-", ""))
+                .tradeId(12345)
+                .pwd("noCheckPwd")
+                .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
+                .build();
+        paymentService.paymentWallet(noCheckPwd);
+    }
+
     /**
      * 月结初始化
      */