From 544c417ddfbd2b458feba1479c4bbc75bcd73cbd Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 13 Nov 2018 16:29:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=A7=9F=E9=87=91=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=B8=BA=E6=9C=AC=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataTowerServiceImpl.java | 40 ++++++++++++++----- .../main/resources/mapper/WxBillAllMapper.xml | 8 ++-- .../resources/mapper/WxBillRentMapper.xml | 2 +- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index d7153a4ee..795f79d1d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -107,10 +107,17 @@ public class DataTowerServiceImpl implements DataTowerService { HashMap rentMap = new HashMap<>(); Map params = new HashMap<>(); params.put("tenantId", tenantId); - Calendar calendar = Calendar.getInstance();//日历对象 - calendar.setTime(new Date());//设置当前日期 - calendar.add(Calendar.MONTH, -1);//月份减一 - params.put("receiveDate", DateUtils.date2String(calendar.getTime(), "yyyy-MM")); + + Calendar instance = Calendar.getInstance(); + instance.set(Calendar.DAY_OF_YEAR,1); + instance.set(Calendar.HOUR_OF_DAY,0); + instance.set(Calendar.MINUTE,0); + instance.set(Calendar.SECOND,0); + String startdate = DateUtils.date2String(instance); + instance.clear(); + String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); + params.put("startdate",startdate); + params.put("enddate",enddate); Map payinfo = wxBillRentMapper.queryPayInfo(params); if (payinfo != null) { BigDecimal receivableAmount = (BigDecimal) payinfo.get("receivepay"); @@ -321,7 +328,16 @@ public class DataTowerServiceImpl implements DataTowerService { HashMap billMap = new HashMap<>(); WxBillAll record = new WxBillAll(); record.setTenantId(tenantId); - record.setMonth(DateUtils.getSystemTime("yyyy-MM")); + Calendar instance = Calendar.getInstance(); + instance.set(Calendar.DAY_OF_YEAR,1); + instance.set(Calendar.HOUR_OF_DAY,0); + instance.set(Calendar.MINUTE,0); + instance.set(Calendar.SECOND,0); + String startdate = DateUtils.date2String(instance); + instance.clear(); + String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); + record.setStarttime(startdate); + record.setEndtime(enddate); record.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); Map oweInfo = wxBillAllMapper.queryOweInfo(record); record.setStatus(EnumBillRentStatus.PAID.getCode()); @@ -399,10 +415,16 @@ public class DataTowerServiceImpl implements DataTowerService { //租金 Map params = new HashMap<>(); params.put("tenantId", tenantId); - Calendar calendar = Calendar.getInstance();//日历对象 - calendar.setTime(new Date());//设置当前日期 - calendar.add(Calendar.MONTH, -1);//月份减一 - params.put("receiveDate", DateUtils.date2String(calendar.getTime(), "yyyy-MM")); + Calendar instance = Calendar.getInstance(); + instance.set(Calendar.DAY_OF_YEAR,1); + instance.set(Calendar.HOUR_OF_DAY,0); + instance.set(Calendar.MINUTE,0); + instance.set(Calendar.SECOND,0); + String startdate = DateUtils.date2String(instance); + instance.clear(); + String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); + params.put("startdate",startdate); + params.put("enddate",enddate); Map payinfo = wxBillRentMapper.queryPayInfo(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 54618fcbc..3f52e176c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -52,8 +52,8 @@ union select id,merchant_id,shop_id,tenant_id,7 bill_type_value,'其他' bill_type,'' need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status from wx_bill_other ) bill - where date_format(bill.receive_date,'%Y-%m')=#{month} and bill.tenant_id=#{tenantId} - and bill.status=#{status} + where bill.tenant_id=#{tenantId} and bill.status=#{status} + and bill.receive_date between #{starttime} and #{endtime} @@ -74,8 +74,8 @@ union select id,merchant_id,shop_id,tenant_id,7 bill_type_value,'其他' bill_type,'' need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status from wx_bill_other ) bill - where date_format(bill.receive_date,'%Y-%m')=#{month} and bill.tenant_id=#{tenantId} - and bill.status=#{status} + where bill.tenant_id=#{tenantId} and bill.status=#{status} + and bill.receive_date between #{starttime} and #{endtime} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 028f906e2..d0b4231e3 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -86,7 +86,7 @@