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/dto/RepaymentDto.java

@@ -64,4 +64,7 @@ public class RepaymentDto extends BaseDto {
     @ApiModelProperty(value = "定时发送状态")
     private Integer cronSendState;
 
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
 }

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;
 
 /**
  *
@@ -94,4 +94,10 @@ public class Repayment extends BaseEntity {
      */
     @TableField("message_commit_time")
     private Date messageCommitTime;
+
+    /**
+     * 消息确认时间
+     */
+    @TableField("create_time")
+    private Date createTime;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RepaymentMapper.xml

@@ -27,7 +27,7 @@
                 and repay_state = #{repayState}
             </if>
         </where>
-        order by rec_date DESC,sequence_nbr DESC
+        order by create_time DESC,sequence_nbr DESC
     </select>
 
     <select id="getPrivilegeCompanyByOrgCode"

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

@@ -262,6 +262,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
                 repayment.setInterest(Double.valueOf(interest));
                 repayment.setPrincipal(Double.valueOf(principal));
                 repayment.setLoanPeriod(loanPeriod);
+                repayment.setCreateTime(new Date());
                 repaymentList.add(repayment);
             }
             try {
@@ -373,9 +374,12 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
 
     @Transactional(rollbackFor = Exception.class)
     public void addOrUpdate(RepaymentDto model) {
+        if(Objects.isNull(model.getSequenceNbr())){
             model.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
             model.setMessageState(RepaymentMessageStateEnum.UN_CONFIRM.getCode());
             model.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
+            model.setCreateTime(new Date());
+        }
         PrivilegeCompany privilegeCompany = repaymentMapper.getPrivilegeCompanyByOrgCode(model.getRegionalCompaniesCode());
         if (Objects.nonNull(privilegeCompany)) {
             model.setCompanyId(privilegeCompany.getSequenceNbr());

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

@@ -88,4 +88,4 @@ feign.okhttp.enabled= true
 
 workflow.feign.name=AMOS-API-WORKFLOW-CZ
 repaymentCron=0 0 1 * * ?
-urlHttp=http://47.92.234.253:8088
+urlHttp=http://47.92.234.253:9000
\ No newline at end of file