|
|
|
@@ -456,6 +456,16 @@ public class WxCouponController extends BaseController { |
|
|
|
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
} |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
couponChannelQ.updateTenantInfo(tenantEntity); |
|
|
|
couponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
couponChannelQ.setStartdate(wxCoupon.getStartdate()); |
|
|
|
couponChannelQ.setEnddate(wxCoupon.getEnddate()); |
|
|
|
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); |
|
|
|
if (null != couponIds && couponIds.size() > 0 ) { |
|
|
|
wxCoupon.setIds(couponIds); |
|
|
|
} |
|
|
|
PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCountData(wxCoupon,tenantEntitys, pageNum, pageSize); |
|
|
|
for (WxCouponStatisVo coupon : pageInfo.getList()) { |
|
|
|
if (coupon.getSaleAmount() == null) { |
|
|
|
@@ -486,6 +496,16 @@ public class WxCouponController extends BaseController { |
|
|
|
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
} |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
couponChannelQ.updateTenantInfo(tenantEntity); |
|
|
|
couponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
couponChannelQ.setStartdate(wxCoupon.getStartdate()); |
|
|
|
couponChannelQ.setEnddate(wxCoupon.getEnddate()); |
|
|
|
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); |
|
|
|
if (null != couponIds && couponIds.size() > 0 ) { |
|
|
|
wxCoupon.setIds(couponIds); |
|
|
|
} |
|
|
|
wxCouponService.exportCardData(wxCoupon,tenantEntitys, request, response); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -509,6 +529,16 @@ public class WxCouponController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
couponChannelQ.updateTenantInfo(tenantEntity); |
|
|
|
couponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
couponChannelQ.setStartdate(wxCoupon.getStartdate()); |
|
|
|
couponChannelQ.setEnddate(wxCoupon.getEnddate()); |
|
|
|
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); |
|
|
|
if (null != couponIds && couponIds.size() > 0 ) { |
|
|
|
wxCoupon.setIds(couponIds); |
|
|
|
} |
|
|
|
|
|
|
|
PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCouponData(wxCoupon, tenantEntitys, pageNum, pageSize); |
|
|
|
for (WxCouponStatisVo coupon : pageInfo.getList()) { |
|
|
|
@@ -537,6 +567,16 @@ public class WxCouponController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
//根据上架时间查询券 |
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
couponChannelQ.updateTenantInfo(tenantEntity); |
|
|
|
couponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
couponChannelQ.setStartdate(wxCoupon.getStartdate()); |
|
|
|
couponChannelQ.setEnddate(wxCoupon.getEnddate()); |
|
|
|
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); |
|
|
|
if (null != couponIds && couponIds.size() > 0 ) { |
|
|
|
wxCoupon.setIds(couponIds); |
|
|
|
} |
|
|
|
wxCouponService.exportCouponData(wxCoupon,tenantEntitys, request, response); |
|
|
|
} |
|
|
|
|
|
|
|
|