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

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

@@ -23,7 +23,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @NoArgsConstructor
-public class OwnerLoanAccountVO {
+public class CarrierOwnerLoanAccountVO {
 
     @ApiModelProperty(value = "货主编码", example = "10000000")
     private Long ownerUserNo;

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

@@ -35,7 +35,7 @@ public class OwnerLoanRecordVO {
 
    
     @ApiModelProperty("交易流水号（第三方）")
-    private Long runningWaterOpenNo;
+    private String runningWaterOpenNo;
 
     @ApiModelProperty("商户流水号")
     private String merchantRunningWaterNo;
@@ -45,7 +45,7 @@ public class OwnerLoanRecordVO {
 
    
     @ApiModelProperty("借款单号")
-    private Long loanNo;
+    private String loanNo;
 
    
     @ApiModelProperty("借款类型 1:虚拟货币  2:资金")

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

@@ -34,7 +34,7 @@ public class OwnerPaymentVO{
 
     
     @ApiModelProperty("交易流水号（第三方）")
-    private Long runningWaterOpenNo;
+    private String runningWaterOpenNo;
 
     
     @ApiModelProperty("付款单号")

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

@@ -36,7 +36,7 @@ public class OwnerRepaymentVO {
 
     
     @ApiModelProperty("交易流水号（第三方）")
-    private Long runningWaterOpenNo;
+    private String runningWaterOpenNo;
 
     @ApiModelProperty("商户流水号")
     private String merchantRunningWaterNo;

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

@@ -3,7 +3,7 @@ package com.clx.performance.controller.pc.loan.carrier;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.clx.performance.vo.pc.loan.carrier.CarrierOwnerLoanAccountVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
@@ -31,8 +31,8 @@ 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);
+    public Result<PageData<CarrierOwnerLoanAccountVO>> pageOwnerLoanAccount(@RequestBody @Validated PageOwnerLoanAccountParam param) {
+        IPage<CarrierOwnerLoanAccountVO> page = ownerLoanAccountService.pageOwnerLoanAccount(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 

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

@@ -4,7 +4,6 @@ import com.clx.performance.param.pc.loan.owner.OwnerLoanRecordParam;
 import com.clx.performance.service.loan.OwnerLoanAccountApproveService;
 import com.clx.performance.service.loan.OwnerLoanAccountService;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
-import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerAccountVO;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;

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

@@ -6,7 +6,7 @@ import com.clx.performance.dao.loan.OwnerLoanAccountDao;
 import com.clx.performance.mapper.loan.OwnerLoanAccountMapper;
 import com.clx.performance.model.loan.OwnerLoanAccount;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
-import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierOwnerLoanAccountVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import com.msl.common.utils.DateUtils;
 import org.springframework.stereotype.Repository;
@@ -32,8 +32,8 @@ public class OwnerLoanAccountDaoImpl extends BaseDaoImpl<OwnerLoanAccountMapper,
     }
 
     @Override
-    public IPage<OwnerLoanAccountVO> pageByParam(PageOwnerLoanAccountParam param) {
-        Page<OwnerLoanAccountVO> page = Page.of(param.getPage(), param.getPageSize());
+    public IPage<CarrierOwnerLoanAccountVO> pageByParam(PageOwnerLoanAccountParam param) {
+        Page<CarrierOwnerLoanAccountVO> page = Page.of(param.getPage(), param.getPageSize());
         return baseMapper.pageByParam(page,param);
     }
 

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.loan.OwnerLoanAccountMapper;
 import com.clx.performance.model.loan.OwnerLoanAccount;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
-import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierOwnerLoanAccountVO;
 import com.msl.common.dao.BaseDao;
 
 import java.time.LocalDateTime;
@@ -18,6 +18,6 @@ public interface OwnerLoanAccountDao extends BaseDao<OwnerLoanAccountMapper, Own
 
     Integer updateAccountCAS(OwnerLoanAccount account, LocalDateTime now, boolean flag);
 
-    IPage<OwnerLoanAccountVO> pageByParam(PageOwnerLoanAccountParam param);
+    IPage<CarrierOwnerLoanAccountVO> pageByParam(PageOwnerLoanAccountParam param);
 
 }

performance-web/src/main/java/com/clx/performance/mapper/loan/OwnerLoanAccountMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.loan.OwnerLoanAccount;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
 import com.clx.performance.sqlProvider.loan.OwnerLoanAccountSqlProvider;
-import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierOwnerLoanAccountVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.Update;
@@ -38,6 +38,6 @@ public interface OwnerLoanAccountMapper extends BaseMapper<OwnerLoanAccount> {
      * @see OwnerLoanAccountSqlProvider#pageByParam(Page, PageOwnerLoanAccountParam)
      */
     @SelectProvider(type = OwnerLoanAccountSqlProvider.class, method = "pageByParam")
-    IPage<OwnerLoanAccountVO> pageByParam(@Param("page") Page<OwnerLoanAccountVO> page, @Param("param") PageOwnerLoanAccountParam param);
+    IPage<CarrierOwnerLoanAccountVO> pageByParam(@Param("page") Page<CarrierOwnerLoanAccountVO> page, @Param("param") PageOwnerLoanAccountParam param);
 
 }

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

@@ -42,7 +42,7 @@ public class OwnerPayment implements HasKey<Integer> {
 
     @TableField("running_water_open_no")
     @ApiModelProperty("交易流水号（第三方）")
-    private Long runningWaterOpenNo;
+    private String runningWaterOpenNo;
 
     @TableField("payment_no")
     @ApiModelProperty("付款单号")

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

@@ -2,12 +2,11 @@ package com.clx.performance.service.impl.loan;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.loan.OwnerLoanAccountDao;
-import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.loan.OwnerLoanAccount;
 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.clx.performance.vo.pc.loan.carrier.CarrierOwnerLoanAccountVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerAccountVO;
 import com.msl.common.base.Optional;
 import com.msl.common.convertor.aspect.UnitCovert;
@@ -55,7 +54,7 @@ public class OwnerLoanAccountServiceImpl  implements OwnerLoanAccountService {
 
     @Override
     @UnitCovert(param = false)
-    public IPage<OwnerLoanAccountVO> pageOwnerLoanAccount(PageOwnerLoanAccountParam param) {
+    public IPage<CarrierOwnerLoanAccountVO> pageOwnerLoanAccount(PageOwnerLoanAccountParam param) {
         return ownerLoanAccountDao.pageByParam(param);
     }
 

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.loan;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.component.IdGenerateSnowFlake;
@@ -49,6 +50,7 @@ import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -307,7 +309,7 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
                 PerformanceResultEnum.DATA_NOT_FIND);
         OwnerLoanRecordVO ownerLoanRecordVO = ownerLoanRecordStruct.convert(ownerLoanRecord);
         //货主借款：  收款方鑫祥和  付款方为诚联信    借款方为货主
-        Map<String,String> map = JSON.parseObject(JSONUtil.parse(ownerLoanRecordVO).toString(), Map.class);
+        Map<String,String> map = JSON.parseObject(JSON.toJSONString(ownerLoanRecordVO), new TypeReference<Map<String,String>>(){});
         // 创建合同
         GenerateContractParam feignParam = new GenerateContractParam();
         if(Objects.equals(OwnerRePaymentEnum.Channel.ORDER.getCode(),param.getPayWay())){

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.loan;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.config.loan.ClxPayeeConfig;
@@ -102,7 +103,7 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(param.getId()).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
         OwnerRepaymentVO ownerRepaymentVO = ownerRepaymentStruct.convert(ownerRepayment);
-        Map<String,String> map = JSON.parseObject(JSONUtil.parse(ownerRepaymentVO).toString(), Map.class);
+        Map<String,String> map = JSON.parseObject(JSON.toJSONString(ownerRepaymentVO), new TypeReference<Map<String,String>>(){});
         // 创建合同
         GenerateContractParam feignParam = new GenerateContractParam();
         if(Objects.equals(OwnerRePaymentEnum.Channel.ORDER.getCode(),param.getPayWay())){

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

@@ -2,7 +2,7 @@ package com.clx.performance.service.loan;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
-import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierOwnerLoanAccountVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerAccountVO;
 
 /**
@@ -14,7 +14,7 @@ public interface OwnerLoanAccountService {
 
     void openOwnerLoanAccount(Long ownerUserNo, String ownerUserName, String mobile);
 
-    IPage<OwnerLoanAccountVO> pageOwnerLoanAccount(PageOwnerLoanAccountParam param);
+    IPage<CarrierOwnerLoanAccountVO> pageOwnerLoanAccount(PageOwnerLoanAccountParam param);
 
     OwnerAccountVO getOwnerLoanAccount();
 }

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

@@ -3,7 +3,7 @@ package com.clx.performance.sqlProvider.loan;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
-import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierOwnerLoanAccountVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
@@ -28,7 +28,7 @@ public class OwnerLoanAccountSqlProvider {
         return sql;
     }
 
-    public String pageByParam(@Param("page") Page<OwnerLoanAccountVO> page, @Param("param") PageOwnerLoanAccountParam param) {
+    public String pageByParam(@Param("page") Page<CarrierOwnerLoanAccountVO> page, @Param("param") PageOwnerLoanAccountParam param) {
         return new SQL(){{
 
             SELECT(" id, owner_user_no as ownerUserNo, owner_user_name as ownerUserName, mobile, " +