From 1cc1ce0eea2a0b43f85810365efbef096de87b56 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 30 Nov 2018 16:36:52 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E5=8D=A1?= =?UTF-8?q?=E5=88=B8=E5=88=9B=E5=BB=BA=E6=9D=A1=E4=BB=B6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index 8a4b029d7..d39b2b0c5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxMerchant; import com.iformall.enums.EnumCouponStatus; +import com.iformall.enums.EnumCouponValidType; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; @@ -119,6 +120,12 @@ public class WxCouponController extends BaseController { } wxCoupon.setTenantId(getUser().getTenantId()); wxCoupon.setChannels(""); + if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { + wxCoupon.setValidStartDate(null); + wxCoupon.setValidEndDate(null); + } else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) { + wxCoupon.setValidDays(null); + } Long id = wxCouponService.saveOrUpdate(wxCoupon); return new ResultData(id); } @@ -134,6 +141,12 @@ public class WxCouponController extends BaseController { String[] arys = wxCoupon.getBusiness().split(","); wxCoupon.setBusiness(JSON.toJSONString(arys)); } + if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { + wxCoupon.setValidStartDate(null); + wxCoupon.setValidEndDate(null); + } else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) { + wxCoupon.setValidDays(null); + } return wxCouponService.updateCoupon(wxCoupon); }