From 2415ae19ddef1dea0caab33d43c3fe8fa8e96d51 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 2 Aug 2019 22:40:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A0=8D=E4=BB=B7=E7=BB=9F=E8=AE=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 6 ---- .../main/resources/mapper/WxCouponMapper.xml | 29 ++++++++----------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index dabec7127..40871032b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -329,12 +329,6 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "券投放-砍价营销列表") public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { Map result = new HashedMap(); - if(wxCoupon.getStartdate() == null){ - wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); - } - if(wxCoupon.getEnddate() == null){ - wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); - } wxCoupon.setTenantId(getTenantId()); PageInfo pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); return new ResultData(pages); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 52cfc7a5b..ec986f131 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -654,23 +654,17 @@