From e74130cd63ad97419517fad58ce1a80d49bce5a4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 22 Dec 2018 14:39:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=9B=BA=E5=AE=9A=E6=A0=BC=E5=BC=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/enums/EnumCampaignType.java | 3 -- .../service/impl/WxCampaignServiceImpl.java | 41 +++++++++++-------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignType.java index 97857addc..c2fb035cb 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignType.java @@ -5,11 +5,8 @@ package com.iformall.enums; */ public enum EnumCampaignType { - // 0-已上架;1-已下架; - STABLE(1, "固定格式"), FREE(2, "自由图文"), - LINK(3,"外部网址") ; public static EnumCampaignType getEnum(Integer code) { 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 f7ef391ea..dbf464918 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -72,14 +72,10 @@ public class WxCampaignServiceImpl implements WxCampaignService { if (StringUtils.isEmpty(wxCampaign.getDetail())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "活动说明不能为空"); } - }else if(wxCampaign.getType().equals(EnumCampaignType.FREE.getCode())) { + } else { if (StringUtils.isEmpty(wxCampaign.getHtml())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "图文不能为空"); } - }else{ - if (StringUtils.isEmpty(wxCampaign.getLink())) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "链接不能为空"); - } } if (wxCampaign.getId() == null) { final IdWorker idWorker = IdWorker.get(); @@ -88,9 +84,32 @@ public class WxCampaignServiceImpl implements WxCampaignService { } else { wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); } + //type 为固定格式才会有券的信息 才会有投放的问题 + if (wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) { + if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) { + addOrUpdateBatch(JSONArray.parseArray(wxCampaign.getCouponIds(), String.class), wxCampaign); + } else { + delBatch(wxCampaign); + } + } return new ResultData(Result.SUCCESS,"操作成功"); } + @Override + public ResultData updateStatus(WxCampaign wxCampaign) { + wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); + wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaign); + //type 为固定格式才会有券的信息 才会有投放的问题 + if (wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) { + if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) { + addOrUpdateBatch(JSONArray.parseArray(wxCampaign.getCouponIds(), String.class), wxCampaign); + } else { + delBatch(wxCampaign); + } + } + return new ResultData(Result.SUCCESS, "操作成功"); + } + public void delBatch(WxCampaign record) { // couponChannel 下架 WxCouponChannel wxCouponChannelQ = new WxCouponChannel(); @@ -188,18 +207,6 @@ public class WxCampaignServiceImpl implements WxCampaignService { return wxCampaignMapper.getMaxSortNum(tenantId); } - @Override - public ResultData updateStatus(WxCampaign wxCampaign) { - wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); - wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaign); - if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) { - addOrUpdateBatch(JSONArray.parseArray(wxCampaign.getCouponIds(),String.class), wxCampaign); - } else { - delBatch(wxCampaign); - } - return new ResultData(Result.SUCCESS,"操作成功"); - } - @Override public void printHtmlById(Long id, HttpServletResponse response) { try {