修改还款

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.RepaymentMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IRepaymentService;
 import com.yeejoin.amos.boot.module.hygf.biz.vo.RepaymentExcelVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -135,8 +136,13 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
     /**
      * 定时发送还款信息 15天发送、5天发送、当天发送
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "${repaymentCron}")
     public void cronSendRepayMessage() {
+        execute();
+    }
+
+    @Async
+    private void execute() {
         List<Repayment> repaymentList = list();
         if (CollectionUtil.isNotEmpty(repaymentList)) {
             for (Repayment repayment : repaymentList) {
@@ -193,17 +199,21 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
                     throw new BadRequest(companyName + ",该用户没有权限");
                 }
 
-                String period = (String) objects.get(1);
-                String repayDate = (String) objects.get(2);
-                String rent = (String) objects.get(3);
-                String interest = (String) objects.get(4);
-                String principal = (String) objects.get(5);
-                String loanPeriod = (String) objects.get(6);
+                String period = String.valueOf(objects.get(1));
+                String repayDate = String.valueOf(objects.get(2));
+                String rent = String.valueOf(objects.get(3));
+                String interest = String.valueOf(objects.get(4));
+                String principal = String.valueOf(objects.get(5));
+                String loanPeriod = String.valueOf(objects.get(6));
                 repayment.setMessageState(RepaymentMessageStateEnum.UN_CONFIRM.getCode());
                 repayment.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
                 repayment.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
                 repayment.setPeriod(period);
-                repayment.setRepayDate(DateUtils.dateParse(repayDate).toInstant()
+                Date date = DateUtils.dateParse(repayDate);
+                if (Objects.isNull(date)){
+                    throw new BadRequest("还款日期格式不对");
+                }
+                repayment.setRepayDate(date.toInstant()
                         .atZone(ZoneId.systemDefault())
                         .toLocalDate());
                 repayment.setRent(Double.valueOf(rent));

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/vo/RepaymentExcelVO.java

@@ -20,16 +20,16 @@ import java.time.LocalDate;
 public class RepaymentExcelVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "公司名称")
-    @Excel(name = "公司名称", width = 50, orderNum = "1")
+    @ApiModelProperty(value = "区域公司")
+    @Excel(name = "区域公司", width = 50, orderNum = "1")
     private String companyName;
 
     @ApiModelProperty(value = "期次")
     @Excel(name = "期次", width = 30, orderNum = "2")
     private String period;
 
-    @ApiModelProperty(value = "还款时间")
-    @Excel(name = "还款时间", width = 30, orderNum = "3")
+    @ApiModelProperty(value = "还款日期")
+    @Excel(name = "还款日期", width = 30, orderNum = "3")
     private LocalDate repayDate;
 
     @ApiModelProperty(value = "租金")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

@@ -87,3 +87,4 @@ exception.debug=true
 feign.okhttp.enabled= true
 
 workflow.feign.name=AMOS-API-WORKFLOW-CZ
+repaymentCron=0 0 1 * * ?
\ No newline at end of file