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

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

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.enums.InvoicingCompanyEnum;
+import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
@@ -12,6 +14,7 @@ import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
+import com.clx.performance.extranal.order.InvoicingCompanyService;
 import com.clx.performance.listener.excel.InvoiceDataListener;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -96,6 +99,9 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
     @Autowired
     private FileUploadFeign fileUploadFeign;
 
+    @Autowired
+    private InvoicingCompanyService invoicingCompanyService;
+
     @Override
     public Integer saveSettlementDetail(OrderChild orderChild, OrderGoods orderGoods, SettlementDriverDetail settlementDriverDetail) {
 
@@ -141,9 +147,16 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         //借款抵扣金额初始化
         settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
 
-        // 开票服务费
-        settlementOwnerDetail.setInvoiceServiceFeeRate(
-                orderGoods.getInvoiceServiceFeeRate()==null? BigDecimal.ZERO : orderGoods.getInvoiceServiceFeeRate());
+        // 查询开票公司
+        InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
+                settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        // 开票服务率
+        settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
+        if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
+            settlementOwnerDetail.setInvoiceServiceFeeRate(
+                    invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
+        }
 
         // 开票服务费
         settlementOwnerDetail.setInvoiceServiceFee(
@@ -622,15 +635,14 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(19, "开票金额", "invoiceFreight", 5000));
         fieldList.add(new ExcelField(20, "订单编号", "orderNo", 5000));
         fieldList.add(new ExcelField(21, "结算单号", "settlementNo", 5000));
-        fieldList.add(new ExcelField(22, "结算子单号", "settlementSubNo", 5000));
-        fieldList.add(new ExcelField(23, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(24, "是否已付尾款", "finalPaymentStatusMsg", 5000));
-        fieldList.add(new ExcelField(25, "是否已开票", "invoiceStatusMsg", 5000));
+        fieldList.add(new ExcelField(22, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(23, "是否已付尾款", "finalPaymentStatusMsg", 5000));
+        fieldList.add(new ExcelField(24, "是否已开票", "invoiceStatusMsg", 5000));
         if (param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())) {
-            fieldList.add(new ExcelField(26, "备注", "separateRemark", 5000));
+            fieldList.add(new ExcelField(25, "备注", "separateRemark", 5000));
         }else {
-            fieldList.add(new ExcelField(26, "开票时间", "invoiceTime", 5000));
-            fieldList.add(new ExcelField(27, "备注", "separateRemark", 5000));
+            fieldList.add(new ExcelField(25, "开票时间", "invoiceTime", 5000));
+            fieldList.add(new ExcelField(26, "备注", "separateRemark", 5000));
         }
 
         // 组装数据
@@ -662,7 +674,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(vo.getInvoiceFreight()==null?null:vo.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(vo.getOrderNo()));
             rowData.add(new ExcelData(vo.getSettlementNo()));
-            rowData.add(new ExcelData(vo.getSettlementSubNo()));
             rowData.add(new ExcelData(vo.getCreateTime()));
             rowData.add(new ExcelData(vo.getFinalPaymentStatusMsg()));
             rowData.add(new ExcelData(vo.getInvoiceStatusMsg()));