From d2609545e377ba25a6c49698ca140fe44c4f52b2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 15:09:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8=E6=8A=A5?= =?UTF-8?q?=E5=90=8D][=E4=BF=AE=E6=94=B9][=E5=8F=91=E9=80=81=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCampaignJoinController.java | 10 +++++----- .../com/iformall/service/WxCampaignJoinService.java | 2 +- .../service/impl/WxCampaignJoinServiceImpl.java | 10 +--------- .../src/main/resources/mapper/WxCampaignJoinMapper.xml | 4 +++- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java index 6a4e3d89f..7df0b85ff 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java @@ -89,17 +89,17 @@ public class WxCampaignJoinController extends BaseController { return wxCampaignJoinService.queryJoinInfo(wxCampaignJoin); } - @ApiOperation("确认报名完成") - @GetMapping("confirmCompletion") - @SystemControllerLog(description = "活动参与信息-确认报名完成") - public ResultData confirmCompletion(@ModelAttribute WxCampaignJoin wxCampaignJoin) { + @ApiOperation("发送短信") + @GetMapping("sendMsg") + @SystemControllerLog(description = "活动参与信息-发送短信") + public ResultData sendMsg(@ModelAttribute WxCampaignJoin wxCampaignJoin) { logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::confirmCompletion"); if (wxCampaignJoin.getCampaignId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "campaignId不能为空"); } wxCampaignJoin.setTenantId(getTenantId()); - return wxCampaignJoinService.confirmCompletion(wxCampaignJoin); + return wxCampaignJoinService.sendMsg(wxCampaignJoin); } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java index 6edf1bb50..d7bcf9423 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java @@ -20,6 +20,6 @@ public interface WxCampaignJoinService { ResultData queryJoinInfo(WxCampaignJoin wxCampaignJoin); - ResultData confirmCompletion(WxCampaignJoin wxCampaignJoin); + ResultData sendMsg(WxCampaignJoin wxCampaignJoin); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java index 2294427ab..725d2953d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java @@ -23,7 +23,6 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -84,14 +83,7 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { } @Override - public ResultData confirmCompletion(WxCampaignJoin wxCampaignJoin) { - //1、修改活动状态 - WxCampaign wxCampaign = new WxCampaign(); - wxCampaign.setId(wxCampaignJoin.getCampaignId()); - wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); - wxCampaign.setUpdateTime(new Date()); - wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); - //2、发送短信 + public ResultData sendMsg(WxCampaignJoin wxCampaignJoin) { WxCampaign campaign = wxCampaignMapper.selectByPrimaryKey(wxCampaignJoin.getCampaignId()); List joinList = wxCampaignJoinMapper.select(wxCampaignJoin); for (WxCampaignJoin join : joinList) { diff --git a/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml index fabdeb43c..8e433e0ca 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml @@ -17,11 +17,13 @@ + + `id`,`tenant_id`,`user_id`,`campaign_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, - `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time` + `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time`,`img_url`