diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java index 7a94396b7..9e5ad36d9 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java @@ -22,7 +22,7 @@ public class FloatingLayerSchedule { /** * 每天0点5分执行 */ - @Scheduled(cron = "0 48 10 * * ?") + @Scheduled(cron = "0 5 0 * * ?") public void sendMsg() { logger.info("删除前一天浮层用户数据开始"); wxCuserFloatingLayerMapper.delete(null); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index cdbde5519..5d4a898be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -335,6 +335,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); wxBillAllVo.setRentStartTime(DateUtils.format(wxBillAllVo.getStarttime())); wxBillAllVo.setRentEndTime(DateUtils.format(wxBillAllVo.getEndtime())); + + //status不是欠缴,都展示0,与前端保持一致 + if(!EnumBillRentStatus.NOT_PAID.getCode().equals(wxBillAllVo.getStatus())){ + wxBillAllVo.setOwe(0l); + wxBillAllVo.setOweStr("0"); + } datalist.add(wxBillAllVo); } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 7f05f5790..1dc59bf67 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -117,7 +117,7 @@