From 38907835b413cca4908ea4deae24bfa9c714293d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Jun 2019 09:50:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=8A=95=E6=94=BE=E5=88=B0=E5=AE=A3=E4=BC=A0=E9=A1=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxActivityController.java | 8 ++++ .../iformall/service/WxActivityService.java | 9 +---- .../service/impl/WxActivityServiceImpl.java | 39 +++++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index b4bd19764..25ca595ab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -84,5 +84,13 @@ public class WxActivityController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxActivity); } + @ApiOperation("投放到宣传页") + @GetMapping("/sendToCampaign") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "活动-投放到宣传页") + public ResultData sendToCampaign(Long id) { + logger.debug("[" + getIpAddr() + "] WxActivityController::sendToCampaign"); + return wxActivityService.sendToCampaign(id); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java index 67a5c0a9d..d1fab041e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java @@ -33,16 +33,11 @@ public interface WxActivityService { */ ResultData saveOrUpdate(WxActivity record); - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - ResultData updateStatus(WxActivity wxActivity); void printHtmlById(Long id, HttpServletResponse response); + ResultData sendToCampaign(Long id); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index a78ab814e..6d9514c8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -7,13 +7,12 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.WxCampaign; import com.iformall.enums.EnumActivityStatus; import com.iformall.enums.EnumActivityType; import com.iformall.mapper.WxActivityMapper; -import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxActivityService; -import com.iformall.service.WxCouponChannelService; -import com.iformall.service.WxCouponService; +import com.iformall.service.WxCampaignService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,15 +36,8 @@ public class WxActivityServiceImpl implements WxActivityService { @Autowired WxActivityMapper wxActivityMapper; - - @Autowired - WxCouponChannelMapper wxCouponChannelMapper; - @Autowired - WxCouponService wxCouponService; - - @Autowired - WxCouponChannelService wxCouponChannelService; + WxCampaignService wxCampaignService; @Override public PageInfo listAsPage(WxActivity record, Integer pageIndex, Integer pageSize) { @@ -109,12 +101,6 @@ public class WxActivityServiceImpl implements WxActivityService { return new ResultData(Result.SUCCESS, "操作成功"); } - @Override - public void deleteById(Long id) { - wxActivityMapper.deleteByPrimaryKey(id); - } - - @Override public void printHtmlById(Long id, HttpServletResponse response) { try { @@ -140,5 +126,24 @@ public class WxActivityServiceImpl implements WxActivityService { } } + @Override + public ResultData sendToCampaign(Long id) { + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + WxCampaign campaign = new WxCampaign(); + campaign.setTenantId(wxActivity.getTenantId()); + campaign.setTitle(wxActivity.getTitle()); + campaign.setSubTitle(wxActivity.getSubTitle()); + campaign.setDetail(wxActivity.getDetail()); + campaign.setValidStartDate(wxActivity.getStartTime()); + campaign.setValidEndDate(wxActivity.getEndTime()); + campaign.setType(wxActivity.getType()); + campaign.setHtml(wxActivity.getHtml()); + campaign.setProduceType(2); + campaign.setProduceId(wxActivity.getId()); + campaign.setPagePath(wxActivity.getWeappPath()); + campaign.setPageScene(wxActivity.getWeappScene()); + return wxCampaignService.addForPath(campaign); + } + }