From 8c7ebeb5b60fa9fe8bb275553afa4d236e371657 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 31 May 2019 12:50:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 05b952427..0d655bda9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1877,7 +1877,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { //自然月 if(adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(count == 0){ - timeVo.setEndDate(DateUtils.getLastDayForMonth(timeVo.getStartDate())); + if(receivePeriod == 1) { //周期1个月 头一个月到当月底 + timeVo.setEndDate(DateUtils.getLastDayForMonth(timeVo.getStartDate())); + }else{ + Date firstDay = DateUtils.getFirstDayForCurrMonth(start); + instance.clear(); + instance.setTime(firstDay); + //最后一个期有余,加上残月,不整除时,最后一个月有余,否则为0 + instance.add(dayType, receivePeriod); + instance.add(Calendar.DAY_OF_MONTH, -1); + timeVo.setEndDate(instance.getTime()); + } } } From e110c1bbdf535bc775bc09ebb22d7cdcd31aa734 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 31 May 2019 12:51:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/app/WxAppinfoController.java | 2 ++ .../com/iformall/service/impl/WxRentContractServiceImpl.java | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index c2c3b9cc6..3d136b35f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -72,6 +72,7 @@ public class WxAppinfoController extends BaseController { String pageUrl = "pages/index/index"; List list = wxMerchantMapper.findQrcodeEmptyList(); + logger.info("updateQrCode.count:"+list.size()); for (WxMerchant merchant : list) { fixedThreadPool.execute(new Runnable() { @Override @@ -95,6 +96,7 @@ public class WxAppinfoController extends BaseController { String pageUrl = "pages/index/index"; List list = wxCouponChannelMapper.findQrcodeEmptyList(); + logger.info("updateCouponQrCode.count:"+list.size()); for (WxCouponChannel couponChannel:list) { fixedThreadPool.execute(new Runnable() { @Override 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 0d655bda9..6ed5276ad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1865,14 +1865,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { //结束时间 SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); - System.out.println(sd.format(start)); +// System.out.println(sd.format(start)); instance.clear(); instance.setTime(start); instance.add(dayType, receivePeriod); instance.add(Calendar.DATE, -1); timeVo.setEndDate(instance.getTime()); - - System.out.println(sd.format(instance.getTime())); +// System.out.println(sd.format(instance.getTime())); //自然月 if(adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){