Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

performance-api/src/main/java/com/clx/performance/param/pc/OwnerBindCardParam.java

@@ -20,6 +20,9 @@ public class OwnerBindCardParam {
     @ApiModelProperty(value = "开户行")
     private String ownerOpenBank;
 
+    @ApiModelProperty(value = "开户行号")
+    private String ownerOpenBankNumber;
+
     @ApiModelProperty(value = "户名")
     private String ownerAccountName;
 

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/OwnerPageSettlementOwnerVO.java

@@ -43,6 +43,9 @@ public class OwnerPageSettlementOwnerVO {
     @ApiModelProperty(value = "货损金额")
     private BigDecimal lossFreight;
     @MoneyOutConvert
+    @ApiModelProperty(value = "借款金额")
+    private BigDecimal loanFreight;
+    @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")
     private BigDecimal settlementFreight;
     @MoneyOutConvert

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

@@ -87,8 +87,7 @@ public class OwnerSettlementOwnerController {
 
     @ApiOperation(value = "导出结算运单明细")
     @PostMapping("/exportOwnerSettlementOrderDetail")
-    public Result exportOwnerSettlementOrderDetail(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param, HttpServletResponse response) throws Exception {
-
+    public Result<Object> exportOwnerSettlementOrderDetail(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param, HttpServletResponse response) throws Exception {
         SXSSFWorkbook workbook = settlementOwnerDetailService.exportOwnerSettlementOrderDetail(param);
         response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
         workbook.write(response.getOutputStream());

performance-web/src/main/java/com/clx/performance/model/OwnerBindCardRecord.java

@@ -58,6 +58,11 @@ public class OwnerBindCardRecord implements HasKey<Integer> {
      */
     @TableField("open_account_bank")
     private String openAccountBank;
+    /**
+     * 开户行号
+     */
+    @TableField("open_account_bank_number")
+    private String openAccountBankNumber;
     /**
      * 户名
      */

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

@@ -664,6 +664,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         feignParam.setOwnerAccountName(param.getOwnerAccountName());
         feignParam.setOwnerBankAccount(param.getOwnerBankAccount());
         feignParam.setOwnerOpenBank(param.getOwnerOpenBank());
+        feignParam.setOwnerOpenBankNumber(param.getOwnerOpenBankNumber());
 
         ownerInfoFeign.bindOwnerBindCard(feignParam);
         OwnerBindCardRecord record = new OwnerBindCardRecord();
@@ -671,7 +672,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         record.setOwnerUserName(loginUserInfo.getUserName());
         record.setCreateItem("绑定银行卡");
         record.setOwnerBank(param.getOwnerAccountBank());
-        record.setOpenAccountBank(param.getOwnerAccountBank());
+        record.setOpenAccountBank(param.getOwnerOpenBank());
+        record.setOpenAccountBankNumber(param.getOwnerOpenBankNumber());
         record.setAccountBankName(param.getOwnerAccountName());
         record.setBankCardNumber(param.getOwnerBankAccount());
         record.setCreateBy(loginUserInfo.getUserName());

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

@@ -195,14 +195,16 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
         fieldList.add(new ExcelField(11, "预付运费金额", "prepayFreight", 5000));
         fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(13, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(14, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(15, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(16, "结算单号", "settlementNo", 15000));
-        fieldList.add(new ExcelField(17, "结算子单号", "settlementSubNo", 15000));
-        fieldList.add(new ExcelField(18, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(19, "是否已付尾款", "finalPaymentStatus", 5000));
-        fieldList.add(new ExcelField(20, "是否已开票", "invoiceStatus", 5000));
+        fieldList.add(new ExcelField(13, "借款抵扣金额", "loanFreight", 5000));
+
+        fieldList.add(new ExcelField(14, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(15, "开票标识", "invoiceType", 5000));
+        fieldList.add(new ExcelField(16, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(17, "结算单号", "settlementNo", 15000));
+        fieldList.add(new ExcelField(18, "结算子单号", "settlementSubNo", 15000));
+        fieldList.add(new ExcelField(19, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(20, "是否已付尾款", "finalPaymentStatus", 5000));
+        fieldList.add(new ExcelField(21, "是否已开票", "invoiceStatus", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -226,6 +228,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getLoanFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceTypeMsg()));
             rowData.add(new ExcelData(dto.getOrderNo()));