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/BorrowerConfigVO.java

@@ -35,12 +35,16 @@ public class BorrowerConfigVO {
     private Integer day;
     @ApiModelProperty(value = "状态：1启用 2禁用", example = "")
     private Integer status;
-    @ApiModelProperty(value = "操作人编码", example = "")
+    @ApiModelProperty(value = "操作人编码", example = "1000")
     private Long opUserNo;
-    @ApiModelProperty(value = "操作人", example = "")
+    @ApiModelProperty(value = "操作人", example = "张三")
     private String opUserName;
     @ApiModelProperty(value = "操作时间", example = "")
     private String opTime;
+    @ApiModelProperty(value = "创建人编号", example = "1000000")
+    private Long createBy;
+    @ApiModelProperty(value = "创建人名称", example = "张三")
+    private String createName;
     @ApiModelProperty(value = "创建时间", example = "")
     private String createTime;
 

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

@@ -41,6 +41,10 @@ public class BorrowerVO {
     private String opUserName;
     @ApiModelProperty(value = "操作时间", example = "")
     private String opTime;
+    @ApiModelProperty(value = "创建人编号", example = "1000000")
+    private Long createBy;
+    @ApiModelProperty(value = "创建人名称", example = "张三")
+    private String createName;
     @ApiModelProperty(value = "创建时间", example = "")
     private String createTime;
 

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;

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/component/OrderChildLoanComponent.java

@@ -83,10 +83,10 @@ public class OrderChildLoanComponent {
 
         if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
             log.info("3.进行标吨判断");
-            determine(quotationDetailVO.getLatestPrice().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
+            determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
         } else {
             log.info("3.进行超吨判断");
-            determine(quotationDetailVO.getLatestPrice().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
+            determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
         }
     }
 

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/Borrower.java

@@ -36,6 +36,8 @@ public class Borrower implements HasKey<Integer> {
     private Long opUserNo;                          //操作人编码
     private String opUserName;                      //操作人
     private LocalDateTime opTime;                   //操作时间
+    private Long createBy;                          //创建人编号
+    private String createName;                      //创建人名称
     private LocalDateTime createTime;               //创建时间
     private LocalDateTime modifiedTime;             //修改时间
 

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

@@ -35,6 +35,8 @@ public class BorrowerConfig implements HasKey<Integer> {
     private Long opUserNo;                          //操作人编码
     private String opUserName;                      //操作人
     private LocalDateTime opTime;                   //操作时间
+    private Long createBy;                          //创建人编号
+    private String createName;                      //创建人名称
     private LocalDateTime createTime;               //创建时间
     private LocalDateTime modifiedTime;             //修改时间
 

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/BorrowerConfigServiceImpl.java

@@ -65,6 +65,8 @@ public class BorrowerConfigServiceImpl implements BorrowerConfigService {
         borrowerConfig.setOpUserNo(loginUserInfo.getUserNo());
         borrowerConfig.setOpUserName(loginUserInfo.getUserName());
         borrowerConfig.setOpTime(LocalDateTime.now());
+        borrowerConfig.setCreateBy(loginUserInfo.getUserNo());
+        borrowerConfig.setCreateName(loginUserInfo.getUserName());
 
         borrowerConfigDao.saveEntity(borrowerConfig);
     }

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

@@ -59,7 +59,8 @@ public class BorrowerServiceImpl implements BorrowerService {
         borrower.setOpUserNo(loginUserInfo.getUserNo());
         borrower.setOpUserName(loginUserInfo.getUserName());
         borrower.setOpTime(LocalDateTime.now());
-
+        borrower.setCreateBy(loginUserInfo.getUserNo());
+        borrower.setCreateName(loginUserInfo.getUserName());
         borrowerDao.saveEntity(borrower);
     }
 

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/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/BorrowerConfigSqlProvider.java

@@ -18,6 +18,7 @@ public class BorrowerConfigSqlProvider {
                     " type, day, " +
                     " delete_status as deleteStatus, status, " +
                     " op_user_no as opUserNo, op_user_name as opUserName, date_format(op_time, '%Y-%m-%d %H:%i:%s') as opTime, " +
+                    " create_by as createBy, create_name as createName, " +
                     " 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/loan/BorrowerSqlProvider.java

@@ -17,6 +17,7 @@ public class BorrowerSqlProvider {
             SELECT(" id, name, bank_name as bankName, bank_card_no as bankCardNo, " +
                     " delete_status, status, " +
                     " op_user_no as opUserNo, op_user_name as opUserName, date_format(op_time, '%Y-%m-%d %H:%i:%s') as opTime, " +
+                    " create_by as createBy, create_name as createName, " +
                     " 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/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, " +