diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 6e5a4a7bd..36a91e652 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -143,7 +143,7 @@ public class WxCampaignController extends BaseController { } } } - return wxCampaignService.updateStatus(wxCampaign); + return wxCampaignService.updateStatus(wxCampaign,EnumProjectPlat.FM); } @ApiOperation("根据id删除接口") diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java index 05c2a512d..7c3c4f5c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java @@ -65,7 +65,7 @@ public interface WxCampaignService { int getMaxSortNum(TenantEntity tenantEntity); - ResultData updateStatus(WxCampaign wxCampaign); + ResultData updateStatus(WxCampaign wxCampaign,EnumProjectPlat projectPlat); void printHtmlById(Long id, HttpServletResponse response); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 8de3c8f62..3a254651b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -170,6 +170,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { } else { wxCampaignMapper.updateById(wxCampaign); } + //type 为固定格式才会有券的信息 才会有投放的问题 couponInject(wxCampaign); return new ResultData(Result.SUCCESS,"操作成功"); @@ -177,14 +178,16 @@ public class WxCampaignServiceImpl implements WxCampaignService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override - public ResultData updateStatus(WxCampaign wxCampaign) { + public ResultData updateStatus(WxCampaign wxCampaign,EnumProjectPlat projectPlat) { wxCampaignMapper.updateById(wxCampaign); if (wxCampaign.getType().equals(EnumCampaignType.PAGEPATH.getCode())) { WxCampaign campaign = wxCampaignMapper.selectById(wxCampaign.getId()); this.updateOtherStatus(campaign.getProduceId(),campaign.getStatus(),campaign.getProduceType()); } - //type 为固定格式才会有券的信息 才会有投放的问题 - couponInject(wxCampaign); + if(EnumProjectPlat.FM.equals(projectPlat)){ + //type 为固定格式才会有券的信息 才会有投放的问题 + couponInject(wxCampaign); + } return new ResultData(Result.SUCCESS, "操作成功"); } diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/WxCampaignController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/WxCampaignController.java index 10eefa950..97bc28482 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/WxCampaignController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/WxCampaignController.java @@ -127,28 +127,28 @@ public class WxCampaignController extends BaseController { ifParentUpdateAloneTenantInfo(); WxCampaign campaign = wxCampaignService.getById(wxCampaign.getId()); // check coupon 状态 - if (campaign.getType().equals(EnumCampaignType.STABLE.getCode())) { - if (campaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode()) - && !wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode())) { - // 宣传页 - 下架不检查状态 - List ids = JSONArray.parseArray(campaign.getCouponIds(), String.class); - for (String couponIdStr : ids) { - Long couponId = Long.parseLong(couponIdStr); - - WxCoupon wxCoupon = wxCouponService.getById(couponId,campaign.getTenantId()); - if (wxCoupon == null) { - return new ResultData(ErrorCode.COUPON_IS_EMPTY); - } - if (wxCoupon.getStatus() != EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()) { - return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); - } - if (wxCoupon.getValidEndDate() != null && wxCoupon.getValidEndDate().before(new Date())) { - return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); - } - } - } - } - return wxCampaignService.updateStatus(wxCampaign); +// if (campaign.getType().equals(EnumCampaignType.STABLE.getCode())) { +// if (campaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode()) +// && !wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode())) { +// // 宣传页 - 下架不检查状态 +// List ids = JSONArray.parseArray(campaign.getCouponIds(), String.class); +// for (String couponIdStr : ids) { +// Long couponId = Long.parseLong(couponIdStr); +// +// WxCoupon wxCoupon = wxCouponService.getById(couponId,campaign.getTenantId()); +// if (wxCoupon == null) { +// return new ResultData(ErrorCode.COUPON_IS_EMPTY); +// } +// if (wxCoupon.getStatus() != EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()) { +// return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); +// } +// if (wxCoupon.getValidEndDate() != null && wxCoupon.getValidEndDate().before(new Date())) { +// return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); +// } +// } +// } +// } + return wxCampaignService.updateStatus(wxCampaign,EnumProjectPlat.TT); } @ApiOperation("根据id删除接口")