|
|
|
@@ -179,9 +179,7 @@ public class WxCouponController extends BaseController { |
|
|
|
if(null == wxCoupon.getContentType()){ |
|
|
|
wxCoupon.setContentType(EnumCouponContentType.NORMAL.getCode()); |
|
|
|
} |
|
|
|
if(null == wxCoupon.getSourceType()){ |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
} |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
|
|
|
|
ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); |
|
|
|
if (resultData.code != 200) { |
|
|
|
@@ -571,6 +569,7 @@ public class WxCouponController extends BaseController { |
|
|
|
// wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
// } |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
|
|
|
|
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
@@ -619,6 +618,7 @@ public class WxCouponController extends BaseController { |
|
|
|
// wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
// } |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
|
|
|
|
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
@@ -655,6 +655,7 @@ public class WxCouponController extends BaseController { |
|
|
|
// } |
|
|
|
|
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
|
|
|
|
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
@@ -697,6 +698,7 @@ public class WxCouponController extends BaseController { |
|
|
|
// } |
|
|
|
|
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
|
|
|
|
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
|