From cc4bc9d541ccb62663672a7e5fbb5d611041db7c Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 13 Sep 2024 15:00:49 +0800 Subject: [PATCH] fix --- .../main/java/com/iformall/domain/po/WxFinanceReceiveBill.java | 3 +++ .../java/com/iformall/service/impl/WxFinanceServiceImpl.java | 1 + .../src/main/resources/mapper/WxFinanceReceiveBillMapper.xml | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java index 7897cc524..95f999212 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java @@ -105,6 +105,9 @@ public class WxFinanceReceiveBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="账单结束周期",name="endtime") private Date endtime; + @io.swagger.annotations.ApiModelProperty(value="支付时间",name="receiveDate") + private Date receiveDate; + @io.swagger.annotations.ApiModelProperty(value = "是否已删除", name = "isDel") private Integer isDel; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 8a852a214..a03b8968c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -934,6 +934,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { final IdWorker idWorker = IdWorker.get(); frbs.setId(idWorker.nextId()); frbs.setReceiveId(addreceive.getId()); + frbs.setReceiveDate(addreceive.getReceiveDate()); frbs.setBillId(bill.getId()); frbs.setBillType(bill.getBillType()); frbs.setFeesId(bill.getEnergyFeesId()); diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml index f7092baac..cfa294a64 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml @@ -19,11 +19,12 @@ + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`bill_type`,`fees_id`, - `pay_way`,`receive_id`,`receive`,`pay`,`merchant_id`,`starttime`,`endtime`,`is_del`,`type` + `pay_way`,`receive_id`,`receive`,`pay`,`merchant_id`,`starttime`,`endtime`,`is_del`,`type`,`receive_date`