From a45c7d6622b6260cf712c8779f9d0fbefbd43018 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 30 Aug 2018 14:41:34 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E6=94=B9]:banner?= =?UTF-8?q?=E5=9B=BE=E4=BD=8D=E7=BD=AE=E9=80=89=E5=88=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCampaignController.java | 5 ++ .../service/impl/WxCampaignServiceImpl.java | 49 ++++++++++--------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java index 247470358..05ec8091e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java @@ -1,6 +1,7 @@ package com.simple.controller; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; @@ -68,6 +69,8 @@ public class WxCampaignController extends BaseController if(StringUtils.isNotBlank(wxCampaign.getCouponIds())) { String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); + }else { + wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); } wxCampaign.setStatus(0); wxCampaign.setTenantId(getTenantId()); @@ -82,6 +85,8 @@ public class WxCampaignController extends BaseController if(StringUtils.isNotBlank(wxCampaign.getCouponIds())) { String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); + }else { + wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); } wxCampaignService.saveOrUpdate(wxCampaign); return new ResultData(); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCampaignServiceImpl.java index fdba3537e..6f2a0e6ef 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCampaignServiceImpl.java @@ -120,32 +120,33 @@ public class WxCampaignServiceImpl implements WxCampaignService { if(wxCouponChannels.size()>0) { for (int i = 0; i < wxCouponChannels.size(); i++) { - - wxCouponChannels.get(i).setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannels.get(i).setBeginTime(record.getValidStartDate()); - wxCouponChannels.get(i).setEndTime(record.getValidEndDate()); - wxCouponChannelMapper.updateByPrimaryKeySelective(wxCouponChannels.get(i)); - wxCouponChannels.remove(i); + if (wxCouponChannels.get(i).getId() == couponId) { + wxCouponChannels.get(i).setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + wxCouponChannels.get(i).setBeginTime(record.getValidStartDate()); + wxCouponChannels.get(i).setEndTime(record.getValidEndDate()); + wxCouponChannelMapper.updateByPrimaryKeySelective(wxCouponChannels.get(i)); + wxCouponChannels.remove(i); + return; + } } } - else { - - WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setBeginTime(record.getValidStartDate()); - wxCouponChannel.setEndTime(record.getValidEndDate()); - wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannel.setCouponId(couponId); - wxCouponChannel.setMerchantId(wxCoupon.getMerchantId()); - wxCouponChannel.setType(wxCoupon.getType()); - wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); - wxCouponChannel.setTenantId(wxCoupon.getTenantId()); - wxCouponChannel.setBusiness(wxCoupon.getBusiness()); - wxCouponChannel.setTitle(wxCoupon.getTitle()); - wxCouponChannel.setSubTargetId(record.getId()); - final IdWorker idWorker = IdWorker.get(); - wxCouponChannel.setId(idWorker.nextId()); - wxCouponChannelMapper.insertSelective(wxCouponChannel); - } + + WxCouponChannel wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setBeginTime(record.getValidStartDate()); + wxCouponChannel.setEndTime(record.getValidEndDate()); + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + wxCouponChannel.setCouponId(couponId); + wxCouponChannel.setMerchantId(wxCoupon.getMerchantId()); + wxCouponChannel.setType(wxCoupon.getType()); + wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); + wxCouponChannel.setTenantId(wxCoupon.getTenantId()); + wxCouponChannel.setBusiness(wxCoupon.getBusiness()); + wxCouponChannel.setTitle(wxCoupon.getTitle()); + wxCouponChannel.setSubTargetId(record.getId()); + final IdWorker idWorker = IdWorker.get(); + wxCouponChannel.setId(idWorker.nextId()); + wxCouponChannelMapper.insertSelective(wxCouponChannel); + } @Override