Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanAccountVO.java

@@ -34,7 +34,6 @@ public class OwnerLoanAccountVO {
     @ApiModelProperty(value = "默认 3：借款账户", example = "3")
     private Integer accountType;
 
-
     @ApiModelProperty(value = "账户余额 (元) ", example = "1.23")
     private BigDecimal amount;
     public BigDecimal getAmount() {

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanRecordVO.java

 package com.clx.performance.vo.pc.loan.carrier;
 
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
+import com.clx.performance.enums.loan.OwnerRePaymentEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -104,6 +105,17 @@ public class OwnerLoanRecordVO {
     @ApiModelProperty("借款归还时间")
     private String loanRepaymentTime;
 
+
+    @ApiModelProperty("支付渠道 10 订单支付 20 转账支付")
+    private Integer payChannel;
+
+    @ApiModelProperty("支付渠道 10 订单支付 20 转账支付")
+    private String payChannelMsg;
+
+    public String getPayChannelMsg(){
+        return OwnerRePaymentEnum.Channel.getMsgByCode(payChannel);
+    }
+
    
     @ApiModelProperty("创建人")
     private String createBy;

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerRepaymentVO.java

@@ -73,7 +73,11 @@ public class OwnerRepaymentVO {
     @ApiModelProperty("收款账户")
     private String payeeAccount;
 
-    
+
+    @ApiModelProperty("货物名称")
+    private String goodsName;
+
+
     @ApiModelProperty("借款单号")
     private Long loanNo;
 

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

@@ -5,6 +5,7 @@ import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
 import com.clx.performance.service.loan.OwnerLoanAccountService;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
 import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,6 +30,7 @@ public class CarrierOwnerLoanAccountController {
 
     @ApiOperation(value = "分页搜索货主借款账户列表",notes = "<br>By:艾庆国")
     @PostMapping("/pageOwnerLoanAccount")
+    @UnitCovert(param = false)
     public Result<PageData<OwnerLoanAccountVO>> pageOwnerLoanAccount(@RequestBody @Validated PageOwnerLoanAccountParam param) {
         IPage<OwnerLoanAccountVO> page = ownerLoanAccountService.pageOwnerLoanAccount(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());

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

@@ -5,6 +5,7 @@ import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountWaterRecord
 import com.clx.performance.service.loan.OwnerLoanAccountRunningWaterRecordService;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountRunningWaterRecordVO;
 import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,13 +21,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(value="/pc/carrier/ownerLoanAccountWaterRecord")
 @Validated
-@Api(tags = "承运端-借款账户")
+@Api(tags = "承运端-借款账户流水")
 public class CarrierOwnerLoanAccountWaterRecordController {
     @Autowired
     private OwnerLoanAccountRunningWaterRecordService ownerLoanAccountRunningWaterRecordService;
 
     @ApiOperation(value = "分页搜索货主借款账户流水列表",notes = "<br>By:艾庆国")
     @PostMapping("/pageOwnerLoanAccountWaterOfOwner")
+    @UnitCovert(param = false)
     public Result<PageData<OwnerLoanAccountRunningWaterRecordVO>> pageOwnerLoanAccountWaterOfOwner(@RequestBody @Validated PageOwnerLoanAccountWaterRecordOfOwnerParam param) {
         IPage<OwnerLoanAccountRunningWaterRecordVO> page = ownerLoanAccountRunningWaterRecordService.pageOwnerLoanAccountWaterOfOwner(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());

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

@@ -47,6 +47,7 @@ public class CarrierOwnerLoanRecordController {
 
     @ApiOperation(value = "分页搜索货主借款列表",notes = "<br>By:艾庆国")
     @PostMapping("/pageOwnerLoanRecordOfOwner")
+    @UnitCovert(param = false)
     public Result<PageData<OwnerLoanRecordVO>> pageOwnerLoanRecordOfOwner(@RequestBody @Validated PageOwnerLoanRecordOfOwner param) {
         IPage<OwnerLoanRecordVO> page = ownerLoanRecordService.pageOwnerLoanRecordOfOwner(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());

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

@@ -40,6 +40,7 @@ public class CarrierOwnerRepaymentController {
 
     @ApiOperation(value = "分页搜索货主还款列表",notes = "<br>By:艾庆国")
     @PostMapping("/pageOwnerRepaymentOfOwner")
+    @UnitCovert(param = false)
     public Result<PageData<OwnerRepaymentVO>> pageOwnerRepaymentOfOwner(@RequestBody @Validated PageOwnerRepaymentOfOwner param) {
         IPage<OwnerRepaymentVO> page = ownerRepaymentService.pageOwnerRepaymentOfOwner(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());

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

+package com.clx.performance.controller.pc.loan.owner;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.loan.carrier.OwnerLoanAccountApproveParam;
+import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountApproveParam;
+import com.clx.performance.service.loan.OwnerLoanAccountApproveService;
+import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountApproveVO;
+import com.msl.common.base.PageData;
+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.*;
+
+import java.util.List;
+
+/**
+ * @ClassName CarrierOwnerLoanAccountApproveController
+ * @Description
+ * @Author kavin
+ * @Date 2024/1/20 17:52
+ * @Version 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/owner/loanAccountApprove")
+@Validated
+@Api(tags = "货主端-资金管理（货主借款账户管理（申请开通借款账户））")
+@AllArgsConstructor
+public class OwnerLoanAccountApproveController {
+
+    private final OwnerLoanAccountApproveService ownerLoanAccountApproveService;
+
+    @ApiOperation(value = "账户申请记录",notes = "<br>By:刘海泉")
+    @GetMapping("/getOwnerLoanAccountApproveList")
+    public Result<List<OwnerLoanAccountApproveVO>> getOwnerLoanAccountApproveList() {
+        List<OwnerLoanAccountApproveVO> list  = ownerLoanAccountApproveService.getOwnerLoanAccountApproveList();
+        return Result.ok(list);
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanAccountApproveDaoImpl.java

@@ -11,6 +11,7 @@ import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -37,4 +38,11 @@ public class OwnerLoanAccountApproveDaoImpl extends BaseDaoImpl<OwnerLoanAccount
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
 
     }
+
+    @Override
+    public List<OwnerLoanAccountApprove> getOwnerLoanAccountApproveList(Long userNo) {
+        LambdaQueryWrapper<OwnerLoanAccountApprove> query = new LambdaQueryWrapper<>();
+        query.orderByDesc(OwnerLoanAccountApprove :: getId);
+        return baseMapper.selectList(query);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/loan/OwnerLoanAccountApproveDao.java

@@ -6,6 +6,7 @@ import com.clx.performance.model.loan.OwnerLoanAccountApprove;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountApproveParam;
 import com.msl.common.dao.BaseDao;
 
+import java.util.List;
 
 /**
  * @author kavin
@@ -14,4 +15,7 @@ import com.msl.common.dao.BaseDao;
  */
 public interface OwnerLoanAccountApproveDao extends BaseDao<OwnerLoanAccountApproveMapper, OwnerLoanAccountApprove, Integer> {
     IPage<OwnerLoanAccountApprove> pageOwnerLoanAccountApprove(PageOwnerLoanAccountApproveParam param);
+
+    List<OwnerLoanAccountApprove> getOwnerLoanAccountApproveList(Long userNo);
+
 }

performance-web/src/main/java/com/clx/performance/model/loan/OwnerLoanRecord.java

@@ -104,6 +104,11 @@ public class OwnerLoanRecord implements HasKey<Integer> {
     @ApiModelProperty("借款归还时间")
     private LocalDateTime loanRepaymentTime;
 
+
+    @TableField("pay_channel")
+    @ApiModelProperty("支付渠道 10 订单支付 20 转账支付")
+    private Integer payChannel;
+
     @TableField("create_by")
     @ApiModelProperty("创建人")
     private String createBy;

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

@@ -46,6 +46,15 @@ public class OwnerLoanAccountApproveServiceImpl  implements OwnerLoanAccountAppr
         return returnPage;
     }
 
+    public List<OwnerLoanAccountApproveVO> getOwnerLoanAccountApproveList() {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        List<OwnerLoanAccountApprove> list = ownerLoanAccountApproveDao.getOwnerLoanAccountApproveList(loginUserInfo.getUserNo());
+        return ownerLoanAccountApproveStruct.convertList(list);
+    }
+
+
+
+
     @Override
     public void openOwnerLoanAccountApprove() {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();

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

@@ -8,6 +8,7 @@ import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
 import com.clx.performance.service.loan.OwnerLoanAccountService;
 import com.clx.performance.struct.loan.OwnerLoanAccountStruct;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
@@ -46,6 +47,7 @@ public class OwnerLoanAccountServiceImpl  implements OwnerLoanAccountService {
     }
 
     @Override
+    @UnitCovert(param = false)
     public IPage<OwnerLoanAccountVO> pageOwnerLoanAccount(PageOwnerLoanAccountParam param) {
         return ownerLoanAccountDao.pageByParam(param);
     }

performance-web/src/main/java/com/clx/performance/service/loan/OwnerLoanAccountApproveService.java

@@ -5,6 +5,8 @@ import com.clx.performance.param.pc.loan.carrier.OwnerLoanAccountApproveParam;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountApproveParam;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountApproveVO;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2024-01-20
@@ -16,4 +18,6 @@ public interface OwnerLoanAccountApproveService {
     void openOwnerLoanAccountApprove();
 
     void ownerLoanAccountApprove(OwnerLoanAccountApproveParam param);
+
+    List<OwnerLoanAccountApproveVO> getOwnerLoanAccountApproveList();
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/borrower/BorrowerConfigSqlProvider.java

@@ -25,7 +25,7 @@ public class BorrowerConfigSqlProvider {
             FROM("borrower_config");
             WHERE("delete_status = 0");
 
-            if (StringUtils.isNotBlank(param.getBorrowerName())) {WHERE("borrower_name = like CONCAT(#{param.borrowerName},'%')");}
+            if (StringUtils.isNotBlank(param.getBorrowerName())) {WHERE("borrower_name like CONCAT(#{param.borrowerName},'%')");}
             if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
 
             ORDER_BY("create_time desc");

performance-web/src/main/java/com/clx/performance/sqlProvider/borrower/BorrowerSqlProvider.java

@@ -24,7 +24,7 @@ public class BorrowerSqlProvider {
             FROM("borrower");
             WHERE("delete_status = 0");
 
-            if (StringUtils.isNotBlank(param.getName())) {WHERE("name = like CONCAT(#{param.name},'%')");}
+            if (StringUtils.isNotBlank(param.getName())) {WHERE("name like CONCAT(#{param.name},'%')");}
 
             ORDER_BY("create_time desc");
         }}.toString();

performance-web/src/main/java/com/clx/performance/sqlProvider/borrower/OwnerLoanAccountRunningWaterRecordSqlProvider.java

@@ -16,7 +16,8 @@ public class OwnerLoanAccountRunningWaterRecordSqlProvider {
 
             SELECT(" id, owner_user_no as ownerUserNo, owner_user_name as ownerUserName, mobile, " +
                     " running_water_no as runningWaterNo, loan_no as loanNo, child_no as childNo, " +
-                    " running_water_type as runningWaterType, alteration_balance as alterationBalance, account_balance as accountBalance, " +
+                    " running_water_type as runningWaterType, " +
+                    " alteration_balance as alterationBalance, account_balance as accountBalance, " +
                     " create_by as createBy, " +
                     " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
                     " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "

performance-web/src/main/java/com/clx/performance/sqlProvider/borrower/OwnerLoanAccountSqlProvider.java

@@ -25,7 +25,7 @@ public class OwnerLoanAccountSqlProvider {
             FROM("owner_loan_account");
 
             if (Objects.nonNull(param.getOwnerUserNo())) {WHERE("owner_user_no = #{param.ownerUserNo}");}
-            if (StringUtils.isNotBlank(param.getOwnerUserName())) {WHERE("owner_user_name = like CONCAT(#{param.ownerUserName},'%')");}
+            if (StringUtils.isNotBlank(param.getOwnerUserName())) {WHERE("owner_user_name like CONCAT(#{param.ownerUserName},'%')");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
 
             ORDER_BY("create_time desc");

performance-web/src/main/java/com/clx/performance/sqlProvider/borrower/OwnerLoanRecordSqlProvider.java

@@ -16,13 +16,16 @@ public class OwnerLoanRecordSqlProvider {
 
             SELECT(" id, owner_user_no as ownerUserNo, owner_user_name as ownerUserName, mobile, " +
                     " running_water_open_no as runningWaterOpenNo, " +
-                    " loan_no as loanNo, loan_type as loanType, loan_balance as loanBalance, borrower, borrower_account as borrowerAccount, " +
-                    " lending_party as lendingParty, lending_party_account as lendingPartyAccount, payee, payee_account as payeeAccount, " +
-                    " status, date_format(approve_time, '%Y-%m-%d %H:%i:%s') as approveTime, approve_by as approveBy, " +
+                    " merchant_running_water_no as merchantRunningWaterNo, " +
+                    " loan_no as loanNo, loan_type as loanType, loan_balance as loanBalance, " +
+                    " borrower, borrower_account as borrowerAccount, " +
+                    " lending_party as lendingParty, lending_party_account as lendingPartyAccount, " +
+                    " payee, payee_account as payeeAccount, " +
+                    " status, " +
+                    " date_format(approve_time, '%Y-%m-%d %H:%i:%s') as approveTime, approve_by as approveBy, " +
                     " reject_reason as rejectReason, date_format(loan_repayment_time, '%Y-%m-%d %H:%i:%s') as loanRepaymentTime, " +
-                    " create_by as createBy, " +
-                    "date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
-                    "date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
+                    " create_by as createBy, date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
+                    " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
             );
 
             FROM("owner_loan_record");

performance-web/src/main/java/com/clx/performance/sqlProvider/borrower/OwnerRepaymentSqlProvider.java

@@ -15,12 +15,16 @@ public class OwnerRepaymentSqlProvider {
         return new SQL(){{
 
             SELECT(" id, owner_user_no as ownerUserNo, owner_user_name as ownerUserName, mobile, " +
-                    " running_water_open_no as runningWaterOpenNo, repayment_no as repaymentNo, " +
-                    " repayment_balance as repaymentBalance, payment, payment_account as paymentAccount, " +
+                    " running_water_open_no as runningWaterOpenNo, " +
+                    " merchant_running_water_no as merchantRunningWaterNo, repayment_no as repaymentNo, repayment_balance as repaymentBalance, " +
+                    " payment, payment_account as paymentAccount, " +
+                    " date_format(payment_application_form_time, '%Y-%m-%d %H:%i:%s') as paymentApplicationFormTime, " +
+                    " remittance_identification_code as remittanceIdentificationCode, " +
+                    " goods_name as goodsName, " +
                     " payee, payee_account as payeeAccount, loan_no as loanNo, status, pay_channel as payChannel, " +
                     " be_overdue as beOverdue, date_format(loan_repayment_time, '%Y-%m-%d %H:%i:%s') as loanRepaymentTime, " +
-                    " date_format(operate_time, '%Y-%m-%d %H:%i:%s') as operateTime, operate_by as operateBy,  create_by as createBy, " +
-                    " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
+                    " date_format(operate_time, '%Y-%m-%d %H:%i:%s') as operateTime, operate_by as operateBy, " +
+                    " create_by as createBy, date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
                     " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
             );