|
|
|
@@ -449,12 +449,12 @@ public class WxCouponController extends BaseController { |
|
|
|
Map<String, Object> result = new HashedMap(); |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); |
|
|
|
if (wxCoupon.getStartdate() == null) { |
|
|
|
wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); |
|
|
|
} |
|
|
|
if (wxCoupon.getEnddate() == null) { |
|
|
|
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
} |
|
|
|
// 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.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
@@ -490,12 +490,12 @@ public class WxCouponController extends BaseController { |
|
|
|
//默认时间本月第一天,截止到当天 |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); |
|
|
|
if (wxCoupon.getStartdate() == null) { |
|
|
|
wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); |
|
|
|
} |
|
|
|
if (wxCoupon.getEnddate() == null) { |
|
|
|
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
} |
|
|
|
// 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.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
@@ -523,12 +523,12 @@ public class WxCouponController extends BaseController { |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); |
|
|
|
Map<String, Object> 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")); |
|
|
|
} |
|
|
|
// 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.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
//根据上架时间查询券 |
|
|
|
@@ -562,12 +562,12 @@ public class WxCouponController extends BaseController { |
|
|
|
//默认时间本月第一天,截止到当天 |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); |
|
|
|
if (wxCoupon.getStartdate() == null) { |
|
|
|
wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); |
|
|
|
} |
|
|
|
if (wxCoupon.getEnddate() == null) { |
|
|
|
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
} |
|
|
|
// 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.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
//根据上架时间查询券 |
|
|
|
|