Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/SettlementOrderChildRiskController.java

@@ -2,6 +2,7 @@ package com.clx.performance.controller.pc.carrier;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.carrier.PageSettlementOrderChildRiskParam;
+import com.clx.performance.param.pc.owner.settle.OwnerSettlementOrderChildRiskProcessUpdateParam;
 import com.clx.performance.service.settle.SettlementOrderChildRiskService;
 import com.clx.performance.vo.pc.carrier.settle.SettlementOrderChildRiskVO;
 import com.msl.common.base.PageData;
@@ -32,6 +33,12 @@ public class SettlementOrderChildRiskController {
 
     private final SettlementOrderChildRiskService settlementOrderChildRiskService;
 
+    @ApiOperation(value = "风控处理",notes = "<br>By:李瑞新")
+    @PostMapping("/updateProcessRisk")
+    public Result updateRiskProcess(@RequestBody @Validated OwnerSettlementOrderChildRiskProcessUpdateParam param) {
+        settlementOrderChildRiskService.updateRiskProcess(param);
+        return Result.ok();
+    }
 
     @ApiOperation(value = "风控异常处理列表",notes = "<br>By:杨启发")
     @PostMapping("/pageSettlementOrderChildRisk")

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerSettlementOrderChildRiskController.java

 package com.clx.performance.controller.pc.owner;
 
-import com.clx.performance.param.pc.owner.settle.OwnerSettlementOrderChildRiskProcessUpdateParam;
 import com.clx.performance.service.settle.SettlementOrderChildRiskService;
-import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,11 +18,6 @@ public class OwnerSettlementOrderChildRiskController {
 
     private final SettlementOrderChildRiskService settlementOrderChildRiskService;
 
-    @ApiOperation(value = "风控处理",notes = "<br>By:李瑞新")
-    @PostMapping("/updateProcessRisk")
-    public Result updateRiskProcess(@RequestBody @Validated OwnerSettlementOrderChildRiskProcessUpdateParam param) {
-        settlementOrderChildRiskService.updateRiskProcess(param);
-        return Result.ok();
-    }
+
 
 }

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

@@ -73,8 +73,6 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
         settlementOrderChildRisk.setProcessBy(loginUserInfo.getUserName());
         settlementOrderChildRisk.setProcessTime(LocalDateTime.now());
 
-        settlementOrderChildRiskDao.updateProcess(settlementOrderChildRisk);
-
         // 转普通单
         if (Objects.equals(param.getProcessMethod(), SettlementOrderChildRiskEnum.ProcessMethod.CONVERT_ORDINARY.getCode())) {
             settlementOwnerDetail.setInvoiceType(SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
@@ -91,11 +89,14 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
             settlementDriverDetail.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
             settlementDriverDetailDao.updateConvertOrdinary(settlementDriverDetail);
 
+            settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
         }
         else {
 
         }
 
+        settlementOrderChildRiskDao.updateProcess(settlementOrderChildRisk);
+
         // 发送mq (风控处理)
         settlementMqService.riskProcess(settlementOrderChildRisk.getId());
     }