Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/Repayment.java

@@ -7,8 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.sql.Date;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  *
@@ -84,6 +84,14 @@ public class Repayment extends BaseEntity {
      */
     @TableField("cron_send_state")
     private Integer cronSendState;
-
-
+    /**
+     * 还款提交时间
+     */
+    @TableField("repay_commit_time")
+    private Date repayCommitTime;
+    /**
+     * 消息确认时间
+     */
+    @TableField("message_commit_time")
+    private Date messageCommitTime;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/RepaymentController.java

@@ -96,7 +96,7 @@ public class RepaymentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/repayBySequenceNbr")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr还款", notes = "根据sequenceNbr还款")
-    public ResponseModel<?> batchRepay(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<?> repayBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
         repaymentService.repay(sequenceNbr);
         return ResponseHelper.buildResponse(null);
     }

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

@@ -435,6 +435,7 @@ public class CommonServiceImpl {
 
                         if (value != null && !"".equals(value)) {
                             String encodedValue = URLEncoder.encode(value.toString(), "UTF-8");
+                            encodedValue = encodedValue.replace("+", "%20");
                             sb.append(field.getName()).append('=').append(encodedValue).append('&');
                         }
                     } catch (IllegalAccessException e) {

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

@@ -33,6 +33,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
@@ -88,6 +89,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
             LambdaUpdateWrapper<Repayment> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.set(Repayment::getMessageState, RepaymentMessageStateEnum.CONFIRM.getCode())
                     .set(Repayment::getCronSendState, RepaymentCronSendStateEnum.UN_SEND.getCode())
+                    .set(Repayment::getMessageCommitTime, new Date())
                     .in(Repayment::getSequenceNbr, sequenceNbrList);
             this.update(updateWrapper);
             for (String sequenceNbr : sequenceNbrList) {
@@ -103,6 +105,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         if (CollectionUtil.isNotEmpty(sequenceNbrList)) {
             LambdaUpdateWrapper<Repayment> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.set(Repayment::getRepayState, RepaymentRepayStateEnum.REPAY.getCode())
+                    .set(Repayment::getRepayCommitTime,new Date())
                     .in(Repayment::getSequenceNbr, sequenceNbrList);
             this.update(updateWrapper);
         }
@@ -113,6 +116,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         LambdaUpdateWrapper<Repayment> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(Repayment::getMessageState, RepaymentMessageStateEnum.CONFIRM.getCode())
                 .set(Repayment::getCronSendState, RepaymentCronSendStateEnum.UN_SEND.getCode())
+                .set(Repayment::getMessageCommitTime, new Date())
                 .eq(Repayment::getSequenceNbr, sequenceNbr);
         this.update(updateWrapper);
         //更新工作台信息
@@ -134,6 +138,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
     public void repay(Long sequenceNbr) {
         LambdaUpdateWrapper<Repayment> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(Repayment::getRepayState, RepaymentRepayStateEnum.REPAY.getCode())
+                .set(Repayment::getRepayCommitTime, new Date())
                 .eq(Repayment::getSequenceNbr, sequenceNbr);
         this.update(updateWrapper);
     }
@@ -177,6 +182,19 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         log.info("==================定时任务执行完成====================");
     }
 
+    /**
+     * 处理Double类型输出为科学计数法
+     * @param number
+     * @return
+     */
+    private String dealDoubleToString(Double number){
+        if(!Objects.isNull(number)){
+            DecimalFormat df = new DecimalFormat("#.##");
+            return df.format(number);
+        }
+       return "0.00";
+    }
+
     private String createTaskName(Repayment repayment) {
         StringBuilder taskNameBuilder = new StringBuilder();
         taskNameBuilder.append("您于");
@@ -190,7 +208,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         taskNameBuilder.append(repayment.getCompanyName());
         taskNameBuilder.append("进行还款,");
         taskNameBuilder.append("金额为");
-        taskNameBuilder.append(repayment.getRent());
+        taskNameBuilder.append(dealDoubleToString(repayment.getRent()));
         taskNameBuilder.append("元");
         return taskNameBuilder.toString();
     }
@@ -324,6 +342,9 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
             List<RepaymentExcelVO> dataList = new ArrayList<>();
             for (Repayment repayment : repaymentList) {
                 RepaymentExcelVO repaymentExcelVO = BeanUtil.copyProperties(repayment, RepaymentExcelVO.class);
+                repaymentExcelVO.setRent(dealDoubleToString(repayment.getRent()));
+                repaymentExcelVO.setPrincipal(dealDoubleToString(repayment.getPrincipal()));
+                repaymentExcelVO.setInterest(dealDoubleToString(repayment.getInterest()));
                 dataList.add(repaymentExcelVO);
             }
             try {

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

@@ -34,15 +34,15 @@ public class RepaymentExcelVO implements Serializable {
 
     @ApiModelProperty(value = "租金(元)")
     @Excel(name = "租金(元)", width = 30, orderNum = "4")
-    private Double rent;
+    private String rent;
 
     @ApiModelProperty(value = "利息(元)")
     @Excel(name = "利息(元)", width = 30, orderNum = "5")
-    private Double interest;
+    private String interest;
 
     @ApiModelProperty(value = "本金(元)")
     @Excel(name = "本金(元)", width = 30, orderNum = "6")
-    private Double principal;
+    private String principal;
 
     @ApiModelProperty(value = "放款批次")
     @Excel(name = "放款批次", width = 30, orderNum = "7")