增加实际付款时间

cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java

@@ -136,6 +136,10 @@ public class CostDto {
     @ApiModelProperty("支付时间")
     private Date payTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("实际付款时间")
+    private Date actualTime;
+
     @ApiModelProperty("转人民币汇率")
     private BigDecimal toRmbRate;
     @ApiModelProperty("费用单人民币总金额")

cost-service/src/main/java/com/blt/other/database/model/CostCashiercallbackDomain.java

@@ -3,6 +3,7 @@ package com.blt.other.database.model;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 public class CostCashiercallbackDomain {
@@ -31,5 +32,6 @@ public class CostCashiercallbackDomain {
     private Integer cashierbankcardtype;
     private String cashiermothercard;
     private BigDecimal toRmbRate;
+    private Date actualTime;
 
 }

cost-service/src/main/java/com/blt/other/module/cost/model/CostDomain.java

@@ -271,6 +271,10 @@ public class CostDomain implements Serializable {
     @ApiModelProperty(value = "ns会计科目Id")
     private Integer nsAccountingSubjectId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("实际付款时间")
+    private Date actualTime;
+
 
     public void setCostType(CostTypeDomain costTypeDomain) {
 

cost-service/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java

@@ -467,6 +467,7 @@ public abstract class AbstractCostService implements CostService {
         costDomain.setAmountRmb(costCashiercallbackDomain.getCashierpaymoneyrmb());
         costDomain.setPayUserId(costCashiercallbackDomain.getPayuserid());
         costDomain.setPayTime(new Date());
+        costDomain.setActualTime(costCashiercallbackDomain.getActualTime());
 
         this.updateCost(costDomain);
         costLogService.save(costCashiercallbackDomain.getCostNo(), costCashiercallbackDomain.getPayuserid(), "出纳收/付款成功：" + costCashiercallbackDomain.getPaynote());

cost-service/src/main/java/com/blt/other/module/cost/vo/Paydetail.java

@@ -3,6 +3,7 @@ package com.blt.other.module.cost.vo;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 public class Paydetail {
@@ -34,4 +35,6 @@ public class Paydetail {
     private Integer cashierbankcardtype;
 
     private String cashiermothercard;
+
+    private Date actualTime;
 }

cost-service/src/main/resources/mapper/CostCashiercallbackMapper.xml

@@ -9,14 +9,14 @@
     cost_no,message,payid,payno,payamount,payuserid,payusername,paynote,cashierbankaccountid,
     cashierbankname,cashierbankcard,cashierbankcardname,cashierunitcode,cashierunitname,
     cashierrate,cashierpaymoney,cashierpaymoneyrmb,cashierservicemoneyrmb,otherordercode,
-    cashierannex,cashierbankcardtype,cashiermothercard,to_rmb_rate
+    cashierannex,cashierbankcardtype,cashiermothercard,to_rmb_rate,actualTime
         )
         VALUE
         (
         #{costNo},#{message}, #{payid}, #{payno}, #{payamount}, #{payuserid}, #{payusername}, #{paynote}, #{cashierbankaccountid},
      #{cashierbankname}, #{cashierbankcard}, #{cashierbankcardname}, #{cashierunitcode}, #{cashierunitname},
      #{cashierrate}, #{cashierpaymoney}, #{cashierpaymoneyrmb}, #{cashierservicemoneyrmb}, #{otherordercode},
-     #{cashierannex}, #{cashierbankcardtype}, #{cashiermothercard},#{toRmbRate}
+     #{cashierannex}, #{cashierbankcardtype}, #{cashiermothercard},#{toRmbRate},#{actualTime}
         )
     </insert>
 </mapper>