From 1c217d24392b20884fb25fdf0856169cce85f727 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 14:36:11 +0800 Subject: [PATCH 1/7] xingxingdiandeng --- .../impl/WxCUserBasicInfoServiceImpl.java | 24 ++++++++++------ .../service/impl/WxCampaignServiceImpl.java | 10 +++++++ .../service/impl/WxMsgServiceImpl.java | 28 ++++++++++++++++--- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index e9db815cc..32e7a1ce1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -521,7 +521,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return wxCUserBasicInfoMapper.findCountByFilter1(tenantEntity,wxCUserBasicInfoDto); }else{ //直接查询本表 - wxCUserBasicInfoDto.undateFinalTenantId(tenantEntity); + wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId()); + wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); return wxCUserBasicInfoMapper.findCountByFilter(wxCUserBasicInfoDto); } } @@ -534,7 +535,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return wxCUserBasicInfoMapper.findListByFilter1(tenantEntity,wxCUserBasicInfoDto); }else{ //直接查询本表 - wxCUserBasicInfoDto.undateFinalTenantId(tenantEntity); + wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId()); + wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); return wxCUserBasicInfoMapper.findListByFilter(wxCUserBasicInfoDto); } } @@ -692,7 +694,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return wxCUserBasicInfoMapper.findCountBySex1(tenantInfo,dto); }else{ //直接查询本表 - dto.undateFinalTenantId(tenantInfo); + dto.setTenantId(tenantInfo.getFinalTenantId()); + dto.setFinalTenantId(tenantInfo.getFinalTenantId()); return wxCUserBasicInfoMapper.findCountBySex(dto); } } @@ -709,7 +712,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return wxCUserBasicInfoMapper.findCountByAge1(tenantInfo,dto); }else{ //直接查询本表 - dto.undateFinalTenantId(tenantInfo); + dto.setTenantId(tenantInfo.getFinalTenantId()); + dto.setFinalTenantId(tenantInfo.getFinalTenantId()); return wxCUserBasicInfoMapper.findCountByAge(dto); } } @@ -726,7 +730,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return wxCUserBasicInfoMapper.findCountByScore1(tenantInfo,dto); }else{ //直接查询本表 - dto.undateFinalTenantId(tenantInfo); + dto.setTenantId(tenantInfo.getFinalTenantId()); + dto.setFinalTenantId(tenantInfo.getFinalTenantId()); return wxCUserBasicInfoMapper.findCountByScore(dto); } } @@ -1127,7 +1132,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return wxCUserBasicInfoMapper.findCount1(tenantInfo,dto); }else{ //直接查询本表 - dto.undateFinalTenantId(tenantInfo); + dto.setTenantId(tenantInfo.getFinalTenantId()); + dto.setFinalTenantId(tenantInfo.getFinalTenantId()); return wxCUserBasicInfoMapper.findCount(dto); } } @@ -1144,7 +1150,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return wxCUserBasicInfoMapper.findCountHistory1(tenantInfo,dto); }else{ //直接查询本表 - dto.undateFinalTenantId(tenantInfo); + dto.setTenantId(tenantInfo.getFinalTenantId()); + dto.setFinalTenantId(tenantInfo.getFinalTenantId()); return wxCUserBasicInfoMapper.findCountHistory(dto); } } @@ -1211,7 +1218,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc return wxCUserBasicInfoMapper.findListByScore1(tenantEntity,wxCUserBasicInfoDto); }else{ //直接查询本表 - wxCUserBasicInfoDto.undateFinalTenantId(tenantEntity); + wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId()); + wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); return wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto); } } 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 294004a40..c51c55238 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.*; import com.iformall.mapper.WxActivityMapper; import com.iformall.mapper.WxCampaignMapper; @@ -249,8 +250,17 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCouponChannelMapper.updateById(wxCouponChannel); wxCouponChannelsMap.remove(couponId); } else { + WxCouponChannel wxCouponChannelQ = new WxCouponChannel(); + wxCouponChannelQ.updateTenantInfo(wxCoupon); + wxCouponChannelQ.setCouponId(couponId); + wxCouponChannelQ.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); + wxCouponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_LIST.getCode()); + List voList = wxCouponChannelMapper.findVoList(wxCouponChannelQ); // 不存在的, 新增 wxCouponChannel = new WxCouponChannel(); + if(voList != null && voList.size() > 0){ + wxCouponChannel.setShowBeginTime(voList.get(0).getShowBeginTime()); + } wxCouponChannel.setBeginTime(record.getValidStartDate()); wxCouponChannel.setEndTime(record.getValidEndDate()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 2448bda34..a796d5dbd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -42,6 +42,9 @@ public class WxMsgServiceImpl implements WxMsgService { @Autowired WxMsgMapper wxMsgMapper; + @Autowired + WxCUserMapper wxCUserMapper; + @Autowired WxMsgConfigMapper wxMsgConfigMapper; @@ -248,6 +251,10 @@ public class WxMsgServiceImpl implements WxMsgService { return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); } if (phones.isEmpty() && filter.isEmpty()) {//两种方式必须选其一 + if(wxMsg.getWay() == EnumSendWay.APPINFOR.getCode()){ + saveOrUpdate(wxMsg,null); + return new ResultData(); + } return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); } @@ -395,10 +402,23 @@ public class WxMsgServiceImpl implements WxMsgService { }else{ return; } - String[] split = wxMsg.getPhones().split(","); - for (String s:split) { - smartAppMsg.setTo(s); - mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + + if(StringUtils.isNotBlank(wxMsg.getPhones())){ + String[] split = wxMsg.getPhones().split(","); + for (String s:split) { + smartAppMsg.setTo(s); + mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } + }else{ + WxCUser wxCUserQ = new WxCUser(); + wxCUserQ.updateTenantInfo(tenantEntity); + + List list = wxCUserMapper.findList(wxCUserQ); + wxMsg.setExpectSendNumber(list.size()); + for (WxCUser u:list) { + smartAppMsg.setTo(u.getOpenId()); + mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } } } From 87c490fcb512356118bc5003dde008db2477e5bb Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 15:28:44 +0800 Subject: [PATCH 2/7] xingxingdiandeng --- .../main/java/com/iformall/service/impl/WxMsgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index a796d5dbd..725e128b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -247,10 +247,10 @@ public class WxMsgServiceImpl implements WxMsgService { //2、通过标签 String phones = wxMsg.getPhones(); List filter = wxMsg.getFilterList(); - if (!phones.isEmpty() && !filter.isEmpty()) {//两种方式只能选其一 + if(StringUtils.isNotBlank(phones) && filter != null && filter.size() > 0){ return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); } - if (phones.isEmpty() && filter.isEmpty()) {//两种方式必须选其一 + if (StringUtils.isBlank(phones) && (filter==null || filter.size() == 0)) {//两种方式必须选其一 if(wxMsg.getWay() == EnumSendWay.APPINFOR.getCode()){ saveOrUpdate(wxMsg,null); return new ResultData(); From dd1452127a4b6f59615b2d31125669f5d06f8aab Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 15:33:20 +0800 Subject: [PATCH 3/7] xingxingdiandeng --- .../controller/msg/WxMsgController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index d70d8f357..112405de9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -7,11 +7,13 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxTemplateMsg; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsg; import com.iformall.enums.EnumSendWay; import com.iformall.service.WxMsgService; +import com.iformall.service.WxTemplateMsgService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -40,6 +42,9 @@ public class WxMsgController extends BaseController { @Autowired private WxMsgService wxMsgService; + @Autowired + WxTemplateMsgService wxTemplateMsgService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -56,6 +61,20 @@ public class WxMsgController extends BaseController { return new ResultData(page); } + @ApiOperation("模板分页列表接口") + @GetMapping("templateList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "moban-列表") + public ResultData templateList(@ModelAttribute WxTemplateMsg wxTemplateMsg, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgController::list"); + if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); + wxTemplateMsg.updateTenantInfo(getTenantInfo()); + final PageInfo page = wxTemplateMsgService.listAsPage(wxTemplateMsg, pageNum, pageSize); + return new ResultData(page); + } + @ApiOperation("新增接口") @PostMapping("add") @SystemControllerLog(description = "标签短信-新增") From 497754302877b42a59f48502ffe2f1529bf9f0f4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 15:47:28 +0800 Subject: [PATCH 4/7] xingxingdiandeng --- .../java/com/iformall/domain/po/WxTemplateMsg.java | 14 ++++++++++++++ .../iformall/service/impl/WxMsgServiceImpl.java | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index ef24bc4b7..15fb70f7c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -1,7 +1,9 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumTemplateType; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,4 +29,16 @@ public class WxTemplateMsg extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="消息开关(0/1)",name="onOff") private Integer onOff; + @io.swagger.annotations.ApiModelProperty(value="模板类型1:核销成功消息,2:核销失败消息, 101:公众号审核结果消息, 102:公众号卡券核销消息",name="type") + @TableField(exist = false) + private String typeName; + + + public String getTypeName(){ + if(this.getType() != null) { + this.typeName = EnumTemplateType.getEnum(this.getType()).name(); + } + return typeName; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 725e128b5..a9395b935 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -247,10 +247,10 @@ public class WxMsgServiceImpl implements WxMsgService { //2、通过标签 String phones = wxMsg.getPhones(); List filter = wxMsg.getFilterList(); - if(StringUtils.isNotBlank(phones) && filter != null && filter.size() > 0){ + if(StringUtils.isNotBlank(phones) && (filter != null || !filter.isEmpty())){ return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); } - if (StringUtils.isBlank(phones) && (filter==null || filter.size() == 0)) {//两种方式必须选其一 + if (StringUtils.isBlank(phones) && (filter==null || filter.isEmpty())) {//两种方式必须选其一 if(wxMsg.getWay() == EnumSendWay.APPINFOR.getCode()){ saveOrUpdate(wxMsg,null); return new ResultData(); From 10c9e991081621f7198eb7787e3d91bd1756008d Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 15:50:26 +0800 Subject: [PATCH 5/7] xingxingdiandeng --- .../main/java/com/iformall/service/impl/WxMsgServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index a9395b935..aa3cf5012 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -247,7 +247,7 @@ public class WxMsgServiceImpl implements WxMsgService { //2、通过标签 String phones = wxMsg.getPhones(); List filter = wxMsg.getFilterList(); - if(StringUtils.isNotBlank(phones) && (filter != null || !filter.isEmpty())){ + if(StringUtils.isNotBlank(phones) && filter != null && !filter.isEmpty()){ return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); } if (StringUtils.isBlank(phones) && (filter==null || filter.isEmpty())) {//两种方式必须选其一 From 2eb8859e8af0e2f4db3636282789477f647f4db5 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 16:13:08 +0800 Subject: [PATCH 6/7] xingxingdiandeng --- .../src/main/java/com/iformall/domain/po/WxTemplateMsg.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index 15fb70f7c..025a579f8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -36,7 +36,7 @@ public class WxTemplateMsg extends TenantEntity { public String getTypeName(){ if(this.getType() != null) { - this.typeName = EnumTemplateType.getEnum(this.getType()).name(); + this.typeName = EnumTemplateType.getEnum(this.getType()).getMessage(); } return typeName; } From 075143e2c9d759ee17966f087227428a37676a70 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 16:48:44 +0800 Subject: [PATCH 7/7] xingxingdiandeng --- .../iformall/controller/msg/WxMsgController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 112405de9..0dcf44be5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -75,6 +75,22 @@ public class WxMsgController extends BaseController { return new ResultData(page); } + @ApiOperation("修改模板接口") + @PostMapping("tempUpd") + @SystemControllerLog(description = "moban xiugai") + public ResultData tempUpd(@RequestBody WxTemplateMsg wxTemplateMsg) { + logger.debug("[" + getIpAddr() + "] WxMsgController::tempUpd"); + if(wxTemplateMsg.getId() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + wxTemplateMsg.updateTenantInfo(getTenantInfo()); +// if(null == wxTemplateMsg.getOnOff()){ +// wxTemplateMsg.setOnOff(1); +// } + wxTemplateMsgService.saveOrUpdate(wxTemplateMsg); + return new ResultData(); + } + @ApiOperation("新增接口") @PostMapping("add") @SystemControllerLog(description = "标签短信-新增")