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()); + } } }