借款账户增加相关字段

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

@@ -40,6 +40,10 @@ public class OwnerLoanAccount implements HasKey<Integer> {
     @ApiModelProperty("联系电话")
     private String mobile;
 
+    @TableField("account_type")
+    @ApiModelProperty("账户类型： 默认3 借款账户")
+    private Integer accountType;
+
     @TableField("funding_amount")
     @ApiModelProperty("资金金额")
     private BigDecimal fundingAmount;
@@ -56,6 +60,10 @@ public class OwnerLoanAccount implements HasKey<Integer> {
     @ApiModelProperty("虚拟币欠款")
     private BigDecimal virtuallyArrears;
 
+    @TableField("create_by")
+    @ApiModelProperty("创建人")
+    private String createBy;
+
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -107,6 +107,7 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
                 //创建还款记录
                 OwnerRepayment ownerRepayment = initOwnerRepayment(ownerLoanRecord);
                 ownerRepaymentDao.saveEntity(ownerRepayment);
+                ownerLoanRecordDao.updateEntityByKey(ownerLoanRecord);
 
 
             } else {
@@ -144,7 +145,7 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
         ownerRepayment.setMobile(ownerLoanRecord.getMobile());
         ownerRepayment.setOwnerUserName(ownerLoanRecord.getOwnerUserName());
         ownerRepayment.setOwnerUserNo(ownerLoanRecord.getOwnerUserNo());
-        ownerRepayment.setLoanNo(ownerRepayment.getLoanNo());
+        ownerRepayment.setLoanNo(ownerLoanRecord.getLoanNo());
         ownerRepayment.setCreateBy(ownerLoanRecord.getOwnerUserName());
         ownerRepayment.setRepaymentBalance(ownerLoanRecord.getLoanBalance());
         ownerRepayment.setRepaymentNo(idGenerateSnowFlake.nextId(2L));
@@ -155,7 +156,7 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
         //TODO 支付渠道  订单支付,转账支付   缺三方的交易流水号
         ownerRepayment.setPayChannel(0);
         ownerRepayment.setRunningWaterOpenNo(0L);
-        ownerRepayment.setBeOverdue(10);
+        ownerRepayment.setBeOverdue(OwnerRePaymentEnum.BeOverdue.NO.getCode());
         ownerRepayment.setCreateBy("系统");
         ownerRepayment.setStatus(OwnerRePaymentEnum.Status.PAY_WAIT.getCode());
         return ownerRepayment;

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -72,7 +72,6 @@ public class SettlementServiceImpl implements SettlementService {
             settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
         } else {
-            //TODO 发送MQ异步
             Message message = MessageBuilder.withBody(JSONUtil.parse(orderChild).toString().getBytes()).build();
             rabbitTemplate.send(
                     RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_EXCHANGE, RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY, message