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

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-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/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/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/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 "
             );