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

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/CashierInfoVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/CarrierCashierInfoVO.java

@@ -20,7 +20,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class CashierInfoVO {
+public class CarrierCashierInfoVO {
 
     @ApiModelProperty("借款单号")
     private Long loanNo;

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/TransferPaymentDetailVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/CarrierTransferPaymentDetailVO.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.*;
@@ -21,7 +20,7 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class TransferPaymentDetailVO {
+public class CarrierTransferPaymentDetailVO {
 
     @ApiModelProperty("收款户名")
     private String payee;

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OrderPaymentDetailVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerOrderPaymentDetailVO.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.*;
@@ -21,7 +20,7 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class OrderPaymentDetailVO {
+public class OwnerOrderPaymentDetailVO {
 
     @ApiModelProperty("借款单号")
     private Long loanNo;

performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/CashierInfoVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/OwnerCashierInfoVO.java

@@ -20,7 +20,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class CashierInfoVO {
+public class OwnerCashierInfoVO {
 
     @ApiModelProperty("还款单号")
     private Long repaymentNo;

performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/OrderPaymentDetailVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/OwnerOrderPaymentDetailVO.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * @ClassName OrderPaymentDetailVO
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class OrderPaymentDetailVO {
+public class OwnerOrderPaymentDetailVO {
 
 
     @ApiModelProperty("还款单号")

performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/TransferPaymentDetailVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/OwnerTransferPaymentDetailVO.java

@@ -20,7 +20,7 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class TransferPaymentDetailVO {
+public class OwnerTransferPaymentDetailVO {
 
     @ApiModelProperty("收款户名")
     private String payee;

performance-web/src/main/java/com/clx/performance/aspect/ResetPasswordAnnotationAop.java

@@ -68,7 +68,7 @@ public class ResetPasswordAnnotationAop {
                 sendMessageMachineCheckComponent.sendMessageMachineSelectCheck(request, sendMobileCaptchaParam);
                 mobile = sendMobileCaptchaParam.getMobile();
                 String content = redisTemplate.opsForValue().get(RedisConstants.MESSAGE_MOBILE_CAPTCHA + mobile);
-                if (StringUtils.isNoneBlank(content)) {
+                if (StringUtils.isNotBlank(content)) {
                     token = UUID.randomUUID().toString();
                     redisTemplate.opsForValue().set(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, token);
                     redisTemplate.expire(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, 60, TimeUnit.SECONDS);

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

 package com.clx.performance.component;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
@@ -82,16 +83,16 @@ public class OrderChildLoanComponent {
 
         if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
             log.info("3.进行标吨判断");
-            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods.getOrderNo(), childNo);
+            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
         } else {
             log.info("3.进行超吨判断");
-            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods.getOrderNo(), childNo);
+            determine(orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
         }
     }
 
-    public void determine(BigDecimal orderChildPrice, OwnerInfoFeignVO ownerInfoFeignVO, String orderNo, String childNo) {
-        log.info("4.预估运费{},货主{},订单号{},运单号{}", orderChildPrice, ownerInfoFeignVO.getUserNo(), orderNo, childNo);
-        List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderNo);
+    public void determine(BigDecimal orderChildPrice, OwnerInfoFeignVO ownerInfoFeignVO, OrderGoods orderGoods, String childNo, Integer overWeight) {
+        log.info("4.预估运费{},货主{},订单号{},运单号{}", orderChildPrice, ownerInfoFeignVO.getUserNo(), orderGoods.getOrderNo(), childNo);
+        List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderGoods.getOrderNo());
         BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
             return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
                     && item.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())
@@ -107,8 +108,17 @@ public class OrderChildLoanComponent {
         log.info("5.查询预付运费相关流水：订单冻结预付运费{}, 扣除流水{}", frozen, takeOut);
         if (subtract.compareTo(BigDecimal.ZERO) > 0) {
             //查询未结算的运单（没有产生扣除流水的运单）
-            List<OrderChild> orderChildList = orderChildDao.selectInTransitOrderChildLtUnsettle(orderNo);
-            BigDecimal orderChildSum = orderChildList.stream().map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+            List<OrderChild> orderChildList = orderChildDao.selectInTransitOrderChildLtUnsettle(orderGoods.getOrderNo());
+            if (CollectionUtil.isEmpty(orderChildList)) {
+                log.info("当前未产生未结算的运单");
+                return;
+            }
+            BigDecimal orderChildSum = null;
+            if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
+                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)).multiply(new BigDecimal(orderChildList.size()));
+            } else {
+                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(orderChildList.size()));
+            }
             BigDecimal ans = subtract.subtract(orderChildSum);
             log.info("6.当前订单冻结的预付运费还有剩余, 查询查询未结算的运单（没有产生扣除流水的运单）总计{},账户剩余{}", orderChildSum, subtract);
 

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

@@ -6,10 +6,10 @@ import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerLoanRecordParam
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
 import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
-import com.clx.performance.vo.pc.loan.carrier.CashierInfoVO;
-import com.clx.performance.vo.pc.loan.carrier.OrderPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierCashierInfoVO;
+import com.clx.performance.vo.pc.loan.carrier.OwnerOrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
-import com.clx.performance.vo.pc.loan.carrier.TransferPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierTransferPaymentDetailVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
@@ -60,8 +60,8 @@ public class CarrierOwnerLoanRecordController {
     @ApiOperation(value = "收银台信息",notes = "<br>By:刘海泉")
     @GetMapping("/getCashierInfo")
     @UnitCovert(param = false)
-    public Result<CashierInfoVO> getCashierInfo(@Param("id") @NotNull(message = "id不能为空") Integer id) {
-        CashierInfoVO vo = ownerLoanRecordService.getCashierInfo(id);
+    public Result<CarrierCashierInfoVO> getCashierInfo(@Param("id") @NotNull(message = "id不能为空") Integer id) {
+        CarrierCashierInfoVO vo = ownerLoanRecordService.getCashierInfo(id);
         return Result.ok(vo);
     }
 
@@ -69,16 +69,16 @@ public class CarrierOwnerLoanRecordController {
     @ApiOperation(value = "订单支付详情",notes = "<br>By:刘海泉")
     @GetMapping("/getOrderPaymentDetail")
     @UnitCovert(param = false)
-    public Result<OrderPaymentDetailVO> getOrderPaymentDetail(@Param("id") @NotNull(message = "id不能为空") Integer id) {
-        OrderPaymentDetailVO vo = ownerLoanRecordService.getOrderPaymentDetail(id);
+    public Result<OwnerOrderPaymentDetailVO> getOrderPaymentDetail(@Param("id") @NotNull(message = "id不能为空") Integer id) {
+        OwnerOrderPaymentDetailVO vo = ownerLoanRecordService.getOrderPaymentDetail(id);
         return Result.ok(vo);
     }
 
     @ApiOperation(value = "转账支付详情",notes = "<br>By:刘海泉")
     @GetMapping("/getTransferPaymentDetail")
     @UnitCovert(param = false)
-    public Result<TransferPaymentDetailVO> getTransferPaymentDetail(@Param("id") @NotNull(message = "id不能为空") Integer id) {
-        TransferPaymentDetailVO vo = ownerLoanRecordService.getTransferPaymentDetail(id);
+    public Result<CarrierTransferPaymentDetailVO> getTransferPaymentDetail(@Param("id") @NotNull(message = "id不能为空") Integer id) {
+        CarrierTransferPaymentDetailVO vo = ownerLoanRecordService.getTransferPaymentDetail(id);
         return Result.ok(vo);
     }
 

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

@@ -2,13 +2,9 @@ package com.clx.performance.controller.pc.loan.owner;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
-import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
-import com.clx.performance.vo.pc.loan.carrier.CashierInfoVO;
-import com.clx.performance.vo.pc.loan.carrier.OrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerLoanRecordDetail;
-import com.clx.performance.vo.pc.loan.carrier.TransferPaymentDetailVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
@@ -18,12 +14,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
-
 @Slf4j
 @RestController
 @RequestMapping(value="/pc/owner/loanRecord")

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

@@ -5,9 +5,9 @@ import com.clx.performance.param.pc.loan.carrier.PageOwnerRepaymentOfOwner;
 import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam;
 import com.clx.performance.service.loan.OwnerRepaymentService;
 import com.clx.performance.vo.pc.loan.carrier.OwnerRepaymentVO;
-import com.clx.performance.vo.pc.loan.owner.CashierInfoVO;
-import com.clx.performance.vo.pc.loan.owner.OrderPaymentDetailVO;
-import com.clx.performance.vo.pc.loan.owner.TransferPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerCashierInfoVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerOrderPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerTransferPaymentDetailVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
@@ -48,8 +48,8 @@ public class OwnerRepaymentController {
     @ApiOperation(value = "收银台信息",notes = "<br>By:刘海泉")
     @GetMapping("/getCashierInfo")
     @UnitCovert(param = false)
-    public Result<CashierInfoVO> getCashierInfo(@Param("id") @NotNull(message = "id不能为空") Integer id) {
-        CashierInfoVO vo = ownerRepaymentService.getCashierInfo(id);
+    public Result<OwnerCashierInfoVO> getCashierInfo(@Param("id") @NotNull(message = "id不能为空") Integer id) {
+        OwnerCashierInfoVO vo = ownerRepaymentService.getCashierInfo(id);
         return Result.ok(vo);
     }
 
@@ -57,16 +57,16 @@ public class OwnerRepaymentController {
     @ApiOperation(value = "订单支付详情",notes = "<br>By:刘海泉")
     @GetMapping("/getOrderPaymentDetail")
     @UnitCovert(param = false)
-    public Result<OrderPaymentDetailVO> getOrderPaymentDetail(@Param("id") @NotNull(message = "id不能为空") Integer id) {
-        OrderPaymentDetailVO vo = ownerRepaymentService.getOrderPaymentDetail(id);
+    public Result<OwnerOrderPaymentDetailVO> getOrderPaymentDetail(@Param("id") @NotNull(message = "id不能为空") Integer id) {
+        OwnerOrderPaymentDetailVO vo = ownerRepaymentService.getOrderPaymentDetail(id);
         return Result.ok(vo);
     }
 
     @ApiOperation(value = "转账支付详情",notes = "<br>By:刘海泉")
     @GetMapping("/getTransferPaymentDetail")
     @UnitCovert(param = false)
-    public Result<TransferPaymentDetailVO> getTransferPaymentDetail(@Param("id") @NotNull(message = "id不能为空") Integer id) {
-        TransferPaymentDetailVO vo = ownerRepaymentService.getTransferPaymentDetail(id);
+    public Result<OwnerTransferPaymentDetailVO> getTransferPaymentDetail(@Param("id") @NotNull(message = "id不能为空") Integer id) {
+        OwnerTransferPaymentDetailVO vo = ownerRepaymentService.getTransferPaymentDetail(id);
         return Result.ok(vo);
     }
 

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

@@ -33,7 +33,7 @@ import com.clx.performance.struct.loan.OwnerLoanRecordStruct;
 import com.clx.performance.vo.pc.loan.carrier.*;
 import com.clx.performance.vo.pc.loan.owner.BorrowerSelectVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerLoanRecordDetail;
-import com.clx.performance.vo.pc.loan.carrier.TransferPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierTransferPaymentDetailVO;
 import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
 import com.clx.user.feign.OwnerFeign;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
@@ -52,7 +52,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -270,20 +269,20 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
 
 
     @Override
-    public CashierInfoVO getCashierInfo(Integer id) {
+    public CarrierCashierInfoVO getCashierInfo(Integer id) {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
-        CashierInfoVO vo = ownerLoanRecordStruct.convertCashierInfo(ownerLoanRecord);
+        CarrierCashierInfoVO vo = ownerLoanRecordStruct.convertCashierInfo(ownerLoanRecord);
         //TODO 设置支付方式和付款账户 ，宇帆提供
         return vo;
     }
 
 
     @Override
-    public OrderPaymentDetailVO getOrderPaymentDetail(Integer id) {
+    public OwnerOrderPaymentDetailVO getOrderPaymentDetail(Integer id) {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
-        OrderPaymentDetailVO vo = ownerLoanRecordStruct.convertOrderPaymentDetail(ownerLoanRecord);
+        OwnerOrderPaymentDetailVO vo = ownerLoanRecordStruct.convertOrderPaymentDetail(ownerLoanRecord);
         //计算倒计时时间，下单时间 + 30天 为截止时间
         LocalDateTime endTime = ownerLoanRecord.getCreateTime().plusDays(30);
         vo.setFinalPaymentTime(DateUtils.formatDateTime(endTime).get());
@@ -291,11 +290,11 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
     }
 
     @Override
-    public TransferPaymentDetailVO getTransferPaymentDetail(Integer id) {
+    public CarrierTransferPaymentDetailVO getTransferPaymentDetail(Integer id) {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
         ClxPayeeConfig.PayeeConfig payeeMap = ClxPayeeConfig.getPayeeMap(ClxPayeeConfig.XXH_ID);
-        return TransferPaymentDetailVO.builder().payee(payeeMap.getName())
+        return CarrierTransferPaymentDetailVO.builder().payee(payeeMap.getName())
                 .payeeAccount(payeeMap.getAccount()).payeeBank(payeeMap.getBank()).payeeBankNo(payeeMap.getBankNo())
                 .loanBalance(ownerLoanRecord.getLoanBalance())
                 .remittanceIdentificationCode(ownerLoanRecord.getRemittanceIdentificationCode())

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

@@ -16,9 +16,9 @@ import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam
 import com.clx.performance.service.loan.OwnerRepaymentService;
 import com.clx.performance.struct.loan.OwnerRepaymentStruct;
 import com.clx.performance.vo.pc.loan.carrier.OwnerRepaymentVO;
-import com.clx.performance.vo.pc.loan.owner.CashierInfoVO;
-import com.clx.performance.vo.pc.loan.owner.OrderPaymentDetailVO;
-import com.clx.performance.vo.pc.loan.owner.TransferPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerCashierInfoVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerOrderPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerTransferPaymentDetailVO;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
 import com.msl.document.api.feign.ContractEvidenceFeign;
@@ -66,19 +66,19 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
     }
 
     @Override
-    public CashierInfoVO getCashierInfo(Integer id) {
+    public OwnerCashierInfoVO getCashierInfo(Integer id) {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
-        CashierInfoVO vo = ownerRepaymentStruct.convertCashierInfo(ownerRepayment);
+        OwnerCashierInfoVO vo = ownerRepaymentStruct.convertCashierInfo(ownerRepayment);
         //TODO 设置支付方式和付款账户 ，宇帆提供
         return vo;
     }
 
     @Override
-    public OrderPaymentDetailVO getOrderPaymentDetail(Integer id) {
+    public OwnerOrderPaymentDetailVO getOrderPaymentDetail(Integer id) {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
-        OrderPaymentDetailVO vo = ownerRepaymentStruct.convertOrderPaymentDetail(ownerRepayment);
+        OwnerOrderPaymentDetailVO vo = ownerRepaymentStruct.convertOrderPaymentDetail(ownerRepayment);
         //计算倒计时时间，下单时间 + 30天 为截止时间
         LocalDateTime endTime = ownerRepayment.getCreateTime().plusDays(30);
         vo.setFinalPaymentTime(DateUtils.formatDateTime(endTime).get());
@@ -86,11 +86,11 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
     }
 
     @Override
-    public TransferPaymentDetailVO getTransferPaymentDetail(Integer id) {
+    public OwnerTransferPaymentDetailVO getTransferPaymentDetail(Integer id) {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
         ClxPayeeConfig.PayeeConfig payeeMap = ClxPayeeConfig.getPayeeMap(ClxPayeeConfig.XXH_ID);
-        return TransferPaymentDetailVO.builder().payee(payeeMap.getName())
+        return OwnerTransferPaymentDetailVO.builder().payee(payeeMap.getName())
                 .payeeAccount(payeeMap.getAccount()).payeeBank(payeeMap.getBank()).payeeBankNo(payeeMap.getBankNo())
                 .repaymentBalance(ownerRepayment.getRepaymentBalance())
                 .remittanceIdentificationCode(ownerRepayment.getRemittanceIdentificationCode())

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

@@ -7,10 +7,10 @@ import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
 import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam;
 import com.clx.performance.param.pc.loan.owner.OwnerLoanRecordParam;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
-import com.clx.performance.vo.pc.loan.carrier.CashierInfoVO;
-import com.clx.performance.vo.pc.loan.carrier.OrderPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierCashierInfoVO;
+import com.clx.performance.vo.pc.loan.carrier.OwnerOrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerLoanRecordDetail;
-import com.clx.performance.vo.pc.loan.carrier.TransferPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierTransferPaymentDetailVO;
 
 /**
  * @author kavin
@@ -28,11 +28,11 @@ public interface OwnerLoanRecordService {
 
     OwnerLoanRecordDetail getOwnerLoanRecordDetail();
 
-    CashierInfoVO getCashierInfo(Integer id);
+    CarrierCashierInfoVO getCashierInfo(Integer id);
 
-    OrderPaymentDetailVO getOrderPaymentDetail(Integer id);
+    OwnerOrderPaymentDetailVO getOrderPaymentDetail(Integer id);
 
-    TransferPaymentDetailVO getTransferPaymentDetail(Integer id);
+    CarrierTransferPaymentDetailVO getTransferPaymentDetail(Integer id);
 
     String savePaymentApplicationForm(ExportPaymentApplicationFormParam param);
 }

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

@@ -5,9 +5,9 @@ import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerRepaymentParam;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerRepaymentOfOwner;
 import com.clx.performance.param.pc.loan.owner.ExportPaymentApplicationFormParam;
 import com.clx.performance.vo.pc.loan.carrier.OwnerRepaymentVO;
-import com.clx.performance.vo.pc.loan.owner.CashierInfoVO;
-import com.clx.performance.vo.pc.loan.owner.OrderPaymentDetailVO;
-import com.clx.performance.vo.pc.loan.owner.TransferPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerCashierInfoVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerOrderPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerTransferPaymentDetailVO;
 
 /**
  * @author kavin
@@ -20,11 +20,11 @@ public interface OwnerRepaymentService {
 
     IPage<OwnerRepaymentVO> pageOwnerRepaymentOfOwner(PageOwnerRepaymentOfOwner param);
 
-    CashierInfoVO getCashierInfo(Integer id);
+    OwnerCashierInfoVO getCashierInfo(Integer id);
 
-    OrderPaymentDetailVO getOrderPaymentDetail(Integer id);
+    OwnerOrderPaymentDetailVO getOrderPaymentDetail(Integer id);
 
-    TransferPaymentDetailVO getTransferPaymentDetail(Integer id);
+    OwnerTransferPaymentDetailVO getTransferPaymentDetail(Integer id);
 
     String savePaymentApplicationForm(ExportPaymentApplicationFormParam param);
 }

performance-web/src/main/java/com/clx/performance/struct/loan/OwnerLoanRecordStruct.java

 package com.clx.performance.struct.loan;
 
 import com.clx.performance.model.loan.OwnerLoanRecord;
-import com.clx.performance.vo.pc.loan.carrier.CashierInfoVO;
-import com.clx.performance.vo.pc.loan.carrier.OrderPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.carrier.CarrierCashierInfoVO;
+import com.clx.performance.vo.pc.loan.carrier.OwnerOrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
@@ -16,9 +16,9 @@ public interface OwnerLoanRecordStruct {
 
     List<OwnerLoanRecordVO> convertList(List<OwnerLoanRecord> list);
 
-    CashierInfoVO convertCashierInfo(OwnerLoanRecord ownerLoanRecord);
+    CarrierCashierInfoVO convertCashierInfo(OwnerLoanRecord ownerLoanRecord);
 
-    OrderPaymentDetailVO convertOrderPaymentDetail(OwnerLoanRecord ownerLoanRecord);
+    OwnerOrderPaymentDetailVO convertOrderPaymentDetail(OwnerLoanRecord ownerLoanRecord);
 
     OwnerLoanRecordVO convert(OwnerLoanRecord ownerLoanRecord);
 }

performance-web/src/main/java/com/clx/performance/struct/loan/OwnerRepaymentStruct.java

@@ -2,8 +2,8 @@ package com.clx.performance.struct.loan;
 
 import com.clx.performance.model.loan.OwnerRepayment;
 import com.clx.performance.vo.pc.loan.carrier.OwnerRepaymentVO;
-import com.clx.performance.vo.pc.loan.owner.CashierInfoVO;
-import com.clx.performance.vo.pc.loan.owner.OrderPaymentDetailVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerCashierInfoVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerOrderPaymentDetailVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
 
@@ -18,7 +18,7 @@ public interface OwnerRepaymentStruct {
 
     List<OwnerRepaymentVO> convertList(List<OwnerRepayment> list);
 
-    CashierInfoVO convertCashierInfo(OwnerRepayment ownerRepayment);
+    OwnerCashierInfoVO convertCashierInfo(OwnerRepayment ownerRepayment);
 
-    OrderPaymentDetailVO convertOrderPaymentDetail(OwnerRepayment ownerRepayment);
+    OwnerOrderPaymentDetailVO convertOrderPaymentDetail(OwnerRepayment ownerRepayment);
 }