From c4abeb5721b026eb76087c50a426d976e7745e7a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 2 Nov 2019 09:42:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=9B=86=E5=9B=A2=E7=89=88=E9=A2=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mem/WxCUserBasicInfoController.java | 8 ++--- .../controller/WxCUserController.java | 4 +-- .../controller/WxCreditHistoryController.java | 2 +- .../iformall/controller/BaseController.java | 5 +-- .../controller/WxUserGrantController.java | 4 ++- .../domain/vo/WxMerchantMicroPayVo.java | 2 ++ .../com/iformall/mapper/WxCampaignMapper.java | 1 + .../service/WxCUserBasicInfoService.java | 14 ++++---- .../iformall/service/WxCampaignService.java | 3 +- .../service/WxCouponPasswordService.java | 5 +-- .../impl/WxCUserBasicInfoServiceImpl.java | 33 ++++++++++--------- .../service/impl/WxCampaignServiceImpl.java | 5 +-- .../impl/WxCouponInjectServiceImpl.java | 2 +- .../impl/WxCouponPasswordServiceImpl.java | 7 ++-- .../service/impl/WxCouponServiceImpl.java | 2 +- .../service/impl/WxMsgServiceImpl.java | 2 +- .../iformall/controller/BaseController.java | 5 +-- 17 files changed, 59 insertions(+), 45 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index f3e2ea8aa..5cfe0bd9a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -522,7 +522,7 @@ public class WxCUserBasicInfoController extends BaseController { if (StringUtils.isEmpty(phone)) { return new ResultData(new ArrayList()); } - List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); + List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantInfo(),phone); WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { wxCUserBasicInfo = wxCUserBasicInfoList.get(0); @@ -535,7 +535,7 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-获取会员过滤器") public ResultData listFilter() { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); - return new ResultData(wxCUserBasicInfoService.listFilters(getTenantId())); + return new ResultData(wxCUserBasicInfoService.listFilters(getTenantInfo())); } @@ -544,7 +544,7 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-会员过滤器获取数量") public ResultData countByFilter(@RequestBody List filterList) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); - return new ResultData(wxCUserBasicInfoService.countByFilter(getTenantId(),filterList)); + return new ResultData(wxCUserBasicInfoService.countByFilter(getTenantInfo(),filterList)); } @ApiOperation("获取会员过滤器") @@ -552,7 +552,7 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-会员过滤器获取") public ResultData listByFilter(@RequestParam List filterList) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); - return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList)); + return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantInfo(),filterList)); } @ApiOperation("根据ID锁定") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index a1fb33a7b..51de154a3 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -8,6 +8,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCUserFromBDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; @@ -94,9 +95,8 @@ public class WxCUserController extends BaseController { if (wxCUserFromB == null) { //TODO phone可能为空 String phone = wxCUser.getPhone(); - String tenantId = wxCUser.getTenantId(); //查询会员信息 - List byPhone = wxCUserBasicInfoService.findByPhone(tenantId, phone); + List byPhone = wxCUserBasicInfoService.findByPhone(bUser, phone); //存在会员信息 if (!byPhone.isEmpty()) { //更新会员信息 diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 384253b64..40175abdb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -83,7 +83,7 @@ public class WxCreditHistoryController extends BaseController { @ApiImplicitParam(name = "phone", value = "phone", dataType = "String", paramType = "query", required = true) public ResultData findByPhone(String phone) { log.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findByPhone"); - List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); + List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantInfo(),phone); WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { wxCUserBasicInfo = wxCUserBasicInfoList.get(0); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index b097d9b64..9d03c2877 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -132,6 +132,7 @@ public class BaseController { public void saveToBasicInfo(WxCUser user) { + TenantEntity tenantEntity = getTenantInfo(); String phone = user.getPhone(); if (phone != null && phone.contains("*")) { phone = user.getVerifyCodePhone(); @@ -139,7 +140,7 @@ public class BaseController { if (StringUtils.isBlank(phone)) return; - List list = wxCUserBasicInfoService.findByPhone(user.getTenantId(), phone); + List list = wxCUserBasicInfoService.findByPhone(tenantEntity, phone); if (list.size() > 0) { WxCUserBasicInfo basicInfo = list.get(0); // 微信名称,统一成微信昵称 @@ -163,7 +164,7 @@ public class BaseController { Date cur = new Date(); WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); basicInfo.setId(user.getId()); - basicInfo.updateTenantInfo(user); + basicInfo.updateTenantInfo(tenantEntity); basicInfo.setPhone(phone); basicInfo.setNickName(user.getNickName()); basicInfo.setSex(user.getGender()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index b2ee23a45..b2806096c 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -12,6 +12,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCUserVo; import com.iformall.domain.vo.WxLevelMerchantCVo; import com.iformall.enums.EnumAssignTagsTrigger; @@ -476,6 +477,7 @@ public class WxUserGrantController extends BaseController { @ApiOperation(value = "授权后获取用户的手机号", notes = "{\"encryptedData\":\"string\",\"iv\":\"string\"}") public ResultData getUserPhone(@RequestBody Map map) { logger.debug(map.toString()); + TenantEntity tenantEntity = getTenantInfo(); Map resultMap = new HashMap(); String encryptedData = map.get("encryptedData"); String iv = map.get("iv"); @@ -512,7 +514,7 @@ public class WxUserGrantController extends BaseController { user.setCountryCode(phoneNoInfo.getCountryCode()); if (isFirstPhone) { //检查是否存在会员信息 如果有 赋值积分 - WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(user.getTenantId(), user.getPhone()); + WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, user.getPhone()); if (basicInfo != null ) { int credit = user.getCredit() == null ? 0 : user.getCredit(); int score = user.getScore() == null ? 0 : user.getScore(); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java index cc3d159d3..8a41eb637 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java @@ -2,8 +2,10 @@ package com.iformall.domain.vo; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = true) public class WxMerchantMicroPayVo extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java index 994bd9a6f..531febd7d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCampaign; +import com.iformall.domain.po.base.TenantEntity; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index c961313c3..ff0fdeab5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -6,6 +6,8 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.CUserBaseInfoT; import com.iformall.domain.vo.UserCountVo; import com.iformall.domain.vo.WxTagsGroupVo; @@ -21,10 +23,10 @@ public interface WxCUserBasicInfoService { * @return */ - List listFilters(String tenantId); - long countByFilter(String tenantId, List filterList); - List listByFilter(String tenantId, List filterList); - List listByFilterList(String tenantId, List filterList); + List listFilters(TenantEntity tenantEntity); + long countByFilter(TenantEntity tenantEntity, List filterList); + List listByFilter(TenantEntity tenantEntity, List filterList); + List listByFilterList(TenantEntity tenantEntity, List filterList); /** * 根据实体查询分页列表 * @@ -78,8 +80,8 @@ public interface WxCUserBasicInfoService { */ void deleteById(Long id); - List findByPhone(String tenantId, String phone); - WxCUserBasicInfo findInfoByPhone(String tenantId, String phone); + List findByPhone(TenantEntity tenantEntity, String phone); + WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone); /** * 修改会员积分 diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java index bc50f1794..6ea5098eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCampaign; +import com.iformall.domain.po.base.TenantEntity; import javax.servlet.http.HttpServletResponse; @@ -57,7 +58,7 @@ public interface WxCampaignService { */ void deleteById(Long id); - int getMaxSortNum(String tenantId); + int getMaxSortNum(TenantEntity tenantEntity); ResultData updateStatus(WxCampaign wxCampaign); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java index aae959129..a933bb045 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCouponPassword; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import javax.servlet.http.HttpServletRequest; @@ -52,11 +53,11 @@ public interface WxCouponPasswordService { /** * 生产卡密 - * @param tenantId + * @param tenantEntity * @param couponId * @param inventory */ - void mkPasswords(String tenantId, Long couponId, Integer inventory); + void mkPasswords(TenantEntity tenantEntity, Long couponId, Integer inventory); /** * 导出兑换码 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 b895fbf68..b282de45d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import com.iformall.enums.*; @@ -398,7 +399,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } } - private WxCUserBasicInfoDto filtersToDto(String tenantId, List filterList){ + private WxCUserBasicInfoDto filtersToDto(TenantEntity tenantEntity, List filterList){ WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); List tagIdList = new ArrayList<>(); @@ -425,7 +426,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { }); if(!tagIdList.isEmpty()) dto.setTagIds(tagIdList); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); return dto; } @@ -438,14 +439,14 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return type; } - private WxTagsTypeVo generateType51(String tenentId) { + private WxTagsTypeVo generateType51(TenantEntity tenantEntity) { WxTagsTypeVo type = new WxTagsTypeVo(); type.setFlag(EnumTagTypeFlag.FLAG_SINGLE.getCode()); type.setName(EnumTagType.ID_51.getMessage()); type.setId(EnumTagType.ID_51.getCode()); List tagsMemberLevel = new ArrayList<>(); - List levels = wxLevelConfigService.getByTenantId(tenentId); + List levels = wxLevelConfigService.getByTenantId(tenantEntity.getTenantId()); WxTags wxTagsBase = new WxTags(); wxTagsBase.setName(WxLevelConfigService.DEFAULT_LEVEL); @@ -491,7 +492,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return type; } - public List listFilters(String tenantId) { + public List listFilters(TenantEntity tenantEntity) { WxTagsGroupVo filter = new WxTagsGroupVo(); filter.setId(EnumTagGroup.ID_10.getCode()); @@ -499,7 +500,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { List types = new ArrayList<>(); types.add(generateType50()); - types.add(generateType51(tenantId)); + types.add(generateType51(tenantEntity)); types.add(generateType52()); types.add(generateType53()); types.add(generateType54()); @@ -510,17 +511,17 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } - public long countByFilter(String tenantId, List filterList) { - return wxCUserBasicInfoMapper.findCountByFilter(filtersToDto(tenantId,filterList)); + public long countByFilter(TenantEntity tenantEntity, List filterList) { + return wxCUserBasicInfoMapper.findCountByFilter(filtersToDto(tenantEntity,filterList)); } - public List listByFilter(String tenantId, List filterList) { - return wxCUserBasicInfoMapper.findListByFilter(filtersToDto(tenantId,filterList)); + public List listByFilter(TenantEntity tenantEntity, List filterList) { + return wxCUserBasicInfoMapper.findListByFilter(filtersToDto(tenantEntity,filterList)); } @Override - public List listByFilterList(String tenantId, List filterList) { + public List listByFilterList(TenantEntity tenantEntity, List filterList) { HashSet userSet = new HashSet<>(); - filterList.stream().forEach(f->userSet.addAll(listByFilter(tenantId,f.getTagList()))); + filterList.stream().forEach(f->userSet.addAll(listByFilter(tenantEntity,f.getTagList()))); return new ArrayList<>(userSet); } @@ -539,9 +540,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } @Override - public List findByPhone(String tenantId, String phone) { + public List findByPhone(TenantEntity tenantEntity, String phone) { WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); - basicQ.setTenantId(tenantId); + basicQ.updateTenantInfo(tenantEntity); basicQ.setPhone(phone); List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); if (basicInfos != null && basicInfos.size() > 0) { @@ -564,10 +565,10 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } @Override - public WxCUserBasicInfo findInfoByPhone(String tenantId, String phone) { + public WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone) { WxCUserBasicInfo basic = null; WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); - basicQ.setTenantId(tenantId); + basicQ.updateTenantInfo(tenantEntity); basicQ.setPhone(phone); List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); if (basicInfos.size() > 0) { 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 440772ecc..12963536f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxActivity; 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.enums.*; import com.iformall.mapper.WxActivityMapper; import com.iformall.mapper.WxCampaignMapper; @@ -286,8 +287,8 @@ public class WxCampaignServiceImpl implements WxCampaignService { } @Override - public int getMaxSortNum(String tenantId) { - return wxCampaignMapper.getMaxSortNum(tenantId); + public int getMaxSortNum(TenantEntity tenantEntity) { + return wxCampaignMapper.getMaxSortNum(tenantEntity.getTenantId()); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index a5861ba1a..1451666a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -138,7 +138,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { } record.setTags(JSON.toJSONString(record.getFilterList())); List userList = - wxCUserBasicInfoService.listByFilterList(record.getTenantId(),record.getFilterList()); + wxCUserBasicInfoService.listByFilterList(record,record.getFilterList()); if(userList.isEmpty()){ return new ResultData(ErrorCode.TAGS_MATCHED_NULL); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 7df5b6534..6c02b00b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.po.WxCouponPassword; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCouponPasswordStatus; import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import com.iformall.common.ErrorCode; @@ -94,13 +95,13 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { } @Override - public void mkPasswords(String tenantId, Long couponId, Integer inventory) { + public void mkPasswords(TenantEntity tenantEntity, Long couponId, Integer inventory) { String strAll = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; // 1.获取 coupon short 1 int couponShort = 0; String couponShortStr = "0"; WxCouponPassword pwQ = new WxCouponPassword(); - pwQ.setTenantId(tenantId); + pwQ.updateTenantInfo(tenantEntity); List pwgList = wxCouponPasswordMapper.findCouponGroupList(pwQ); couponShort = pwgList.size(); couponShortStr = String.valueOf(strAll.charAt(couponShort)); @@ -134,7 +135,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { for (int i=0;i list = - wxCUserBasicInfoService.listByFilterList(wxMsg.getTenantId(),wxMsg.getFilterList()); + wxCUserBasicInfoService.listByFilterList(tenantEntity,wxMsg.getFilterList()); wxMsg.setExpectSendNumber(list.size());//预计发送数量 phones = list.stream().map(u -> u.getPhone()).collect(Collectors.joining(",")); if (phones==null || phones.isEmpty()) {//解析之后手机号依然不存在时返回 diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java index dd014bb31..f38ff1dae 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java @@ -131,6 +131,7 @@ public class BaseController { public void saveToBasicInfo(WxCUser user) { + TenantEntity tenantEntity = getTenantInfo(); String phone = user.getPhone(); if (phone != null && phone.contains("*")) { phone = user.getVerifyCodePhone(); @@ -138,7 +139,7 @@ public class BaseController { if (StringUtils.isBlank(phone)) return; - List list = wxCUserBasicInfoService.findByPhone(user.getTenantId(), phone); + List list = wxCUserBasicInfoService.findByPhone(tenantEntity, phone); if (list.size() > 0) { WxCUserBasicInfo basicInfo = list.get(0); // 微信名称 @@ -158,7 +159,7 @@ public class BaseController { Date cur = new Date(); WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); basicInfo.setId(user.getId()); - basicInfo.setTenantId(user.getTenantId()); + basicInfo.updateTenantInfo(tenantEntity); basicInfo.setPhone(phone); basicInfo.setNickName(user.getNickName()); basicInfo.setSex(user.getGender());