From 3d3272c5a75f6cd89893da89b58b35558522a518 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 13 Apr 2023 20:40:05 +0800 Subject: [PATCH] fix bill --- .../java/com/iformall/domain/po/WxBillRent.java | 6 +++++- .../service/impl/WxRentContractServiceImpl.java | 4 +++- .../main/resources/mapper/WxBillRentMapper.xml | 15 ++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 3077d3590..635b31282 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -152,10 +152,14 @@ public class WxBillRent extends TenantEntity { @Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime") private Date starttime; - + @Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") private Date endtime; + @TableField(exist = false) + private Date endtimeBegin; + @TableField(exist = false) + private Date endtimeEnd; @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") private Integer rentShopType; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 6794e852d..07987b959 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3243,7 +3243,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { bq.updateTenantInfo(wxRentContract); bq.setRentContractId(wxRentContract.getId()); bq.setIsPreview(EnumIsPreview.NO.getCode()); - bq.setEndtime(DateUtils.getDayBegin(DateUtils.getTimeAfterDays(-1, new Date()))); + Date current = new Date(); + bq.setEndtimeBegin(DateUtils.getDayBegin(DateUtils.getTimeAfterDays(-30, current))); + bq.setEndtimeEnd(current); bq.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List billList = wxBillRentMapper.findList(bq); if (null != billList && billList.size() > 0 ) { diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 6c74dcc15..529902618 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -97,7 +97,12 @@ and `late_pay_status` = #{latePayStatus} and `starttime` = #{starttime} and `endtime` = #{endtime} - + + and endtime >= #{endtimeBegin} + + + and endtime < #{endtimeEnd} + and id in @@ -177,10 +182,10 @@ and `parent_tenant_id` = #{parentTenantId} - and receive_date >= #{startdate} + and receive_date >= #{startTime} - and receive_date < #{enddate} + and receive_date < #{endTime} @@ -195,10 +200,10 @@ and `parent_tenant_id` = #{parentTenantId} - and receive_date >= #{startdate} + and receive_date >= #{startTime} - and receive_date < #{enddate} + and receive_date < #{endTime}