| @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxCoupon; | |||||
| import com.iformall.domain.po.WxCouponChannel; | import com.iformall.domain.po.WxCouponChannel; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.enums.EnumCouponStatus; | import com.iformall.enums.EnumCouponStatus; | ||||
| import com.iformall.enums.EnumCouponValidType; | |||||
| import com.iformall.enums.EnumMerchantStatus; | import com.iformall.enums.EnumMerchantStatus; | ||||
| import com.iformall.service.WxCouponChannelService; | import com.iformall.service.WxCouponChannelService; | ||||
| import com.iformall.service.WxCouponService; | import com.iformall.service.WxCouponService; | ||||
| @@ -119,6 +120,12 @@ public class WxCouponController extends BaseController { | |||||
| } | } | ||||
| wxCoupon.setTenantId(getUser().getTenantId()); | wxCoupon.setTenantId(getUser().getTenantId()); | ||||
| wxCoupon.setChannels(""); | 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); | Long id = wxCouponService.saveOrUpdate(wxCoupon); | ||||
| return new ResultData(id); | return new ResultData(id); | ||||
| } | } | ||||
| @@ -134,6 +141,12 @@ public class WxCouponController extends BaseController { | |||||
| String[] arys = wxCoupon.getBusiness().split(","); | String[] arys = wxCoupon.getBusiness().split(","); | ||||
| wxCoupon.setBusiness(JSON.toJSONString(arys)); | 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); | return wxCouponService.updateCoupon(wxCoupon); | ||||
| } | } | ||||