diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index bfc67d5f6..1b779efa8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -456,7 +456,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 (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { //根据上架时间查询券 WxCouponChannel couponChannelQ = new WxCouponChannel(); couponChannelQ.updateTenantInfo(tenantEntity); @@ -468,7 +468,11 @@ public class WxCouponController extends BaseController { }else { wxCoupon.setId(-1L); } + }else { + } + + PageInfo pageInfo = wxCouponService.findCountData(wxCoupon,tenantEntitys, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { if (coupon.getSaleAmount() == null) { @@ -500,7 +504,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 (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { //根据上架时间查询券 WxCouponChannel couponChannelQ = new WxCouponChannel(); couponChannelQ.updateTenantInfo(tenantEntity); @@ -536,7 +540,7 @@ public class WxCouponController extends BaseController { // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { //根据上架时间查询券 WxCouponChannel couponChannelQ = new WxCouponChannel(); couponChannelQ.updateTenantInfo(tenantEntity); @@ -578,7 +582,7 @@ public class WxCouponController extends BaseController { // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { //根据上架时间查询券 WxCouponChannel couponChannelQ = new WxCouponChannel(); couponChannelQ.updateTenantInfo(tenantEntity); @@ -632,7 +636,7 @@ public class WxCouponController extends BaseController { //根据投放时间搜索 private void handleCouponStartDate(WxCoupon wxCoupon){ - if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) { + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { WxCouponChannel couponChannelQ = new WxCouponChannel(); couponChannelQ.updateTenantInfo(wxCoupon); couponChannelQ.setStartdate(wxCoupon.getStartdate()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 6d483f91e..0fdfd1a38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -80,7 +80,7 @@ public class WxOrderGroupController extends BaseController { //处理投放时间 private void handleCouponStartDate(WxOrderGroupMarketing wxOrderGroupMarketing){ - if (EnumYesOrNo.YES.getCode() == wxOrderGroupMarketing.getPutIn()) { + if (null != wxOrderGroupMarketing.getStartdate() || null != wxOrderGroupMarketing.getEnddate()) { WxCouponChannel couponChannelQ = new WxCouponChannel(); couponChannelQ.updateTenantInfo(wxOrderGroupMarketing); couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index bfed536f9..36cc5f6c3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -400,9 +400,6 @@ public class WxCoupon extends TenantEntity { @TableField(exist = false) private String[] mallTenantIds; - - @TableField(exist = false) - private Integer putIn;//是否已投放 public String getSalePriceStr() { if(salePrice!=null) {