| @@ -522,7 +522,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| if (StringUtils.isEmpty(phone)) { | |||
| return new ResultData(new ArrayList<WxCUserBasicInfo>()); | |||
| } | |||
| List<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); | |||
| List<WxCUserBasicInfo> 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<WxCUserBasicInfoFilterDto> 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<WxCUserBasicInfoFilterDto> filterList) { | |||
| logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); | |||
| return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList)); | |||
| return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantInfo(),filterList)); | |||
| } | |||
| @ApiOperation("根据ID锁定") | |||
| @@ -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<WxCUserBasicInfo> byPhone = wxCUserBasicInfoService.findByPhone(tenantId, phone); | |||
| List<WxCUserBasicInfo> byPhone = wxCUserBasicInfoService.findByPhone(bUser, phone); | |||
| //存在会员信息 | |||
| if (!byPhone.isEmpty()) { | |||
| //更新会员信息 | |||
| @@ -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<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); | |||
| List<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantInfo(),phone); | |||
| WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); | |||
| if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { | |||
| wxCUserBasicInfo = wxCUserBasicInfoList.get(0); | |||
| @@ -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<WxCUserBasicInfo> list = wxCUserBasicInfoService.findByPhone(user.getTenantId(), phone); | |||
| List<WxCUserBasicInfo> 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()); | |||
| @@ -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<String, String> 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(); | |||
| @@ -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; | |||
| @@ -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; | |||
| @@ -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<WxTagsGroupVo> listFilters(String tenantId); | |||
| long countByFilter(String tenantId, List<WxCUserBasicInfoFilterDto> filterList); | |||
| List<WxCUserBasicInfo> listByFilter(String tenantId, List<WxCUserBasicInfoFilterDto> filterList); | |||
| List<WxCUserBasicInfo> listByFilterList(String tenantId, List<WxCUserBasicInfoFilterListDto> filterList); | |||
| List<WxTagsGroupVo> listFilters(TenantEntity tenantEntity); | |||
| long countByFilter(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList); | |||
| List<WxCUserBasicInfo> listByFilter(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList); | |||
| List<WxCUserBasicInfo> listByFilterList(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterListDto> filterList); | |||
| /** | |||
| * 根据实体查询分页列表 | |||
| * | |||
| @@ -78,8 +80,8 @@ public interface WxCUserBasicInfoService { | |||
| */ | |||
| void deleteById(Long id); | |||
| List<WxCUserBasicInfo> findByPhone(String tenantId, String phone); | |||
| WxCUserBasicInfo findInfoByPhone(String tenantId, String phone); | |||
| List<WxCUserBasicInfo> findByPhone(TenantEntity tenantEntity, String phone); | |||
| WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone); | |||
| /** | |||
| * 修改会员积分 | |||
| @@ -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); | |||
| @@ -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); | |||
| /** | |||
| * 导出兑换码 | |||
| @@ -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<WxCUserBasicInfoFilterDto> filterList){ | |||
| private WxCUserBasicInfoDto filtersToDto(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList){ | |||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | |||
| List<Long> 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<WxTags> tagsMemberLevel = new ArrayList<>(); | |||
| List<WxLevelConfig> levels = wxLevelConfigService.getByTenantId(tenentId); | |||
| List<WxLevelConfig> 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<WxTagsGroupVo> listFilters(String tenantId) { | |||
| public List<WxTagsGroupVo> listFilters(TenantEntity tenantEntity) { | |||
| WxTagsGroupVo filter = new WxTagsGroupVo(); | |||
| filter.setId(EnumTagGroup.ID_10.getCode()); | |||
| @@ -499,7 +500,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||
| List<WxTagsTypeVo> 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<WxCUserBasicInfoFilterDto> filterList) { | |||
| return wxCUserBasicInfoMapper.findCountByFilter(filtersToDto(tenantId,filterList)); | |||
| public long countByFilter(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList) { | |||
| return wxCUserBasicInfoMapper.findCountByFilter(filtersToDto(tenantEntity,filterList)); | |||
| } | |||
| public List<WxCUserBasicInfo> listByFilter(String tenantId, List<WxCUserBasicInfoFilterDto> filterList) { | |||
| return wxCUserBasicInfoMapper.findListByFilter(filtersToDto(tenantId,filterList)); | |||
| public List<WxCUserBasicInfo> listByFilter(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList) { | |||
| return wxCUserBasicInfoMapper.findListByFilter(filtersToDto(tenantEntity,filterList)); | |||
| } | |||
| @Override | |||
| public List<WxCUserBasicInfo> listByFilterList(String tenantId, List<WxCUserBasicInfoFilterListDto> filterList) { | |||
| public List<WxCUserBasicInfo> listByFilterList(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterListDto> filterList) { | |||
| HashSet<WxCUserBasicInfo> 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<WxCUserBasicInfo> findByPhone(String tenantId, String phone) { | |||
| public List<WxCUserBasicInfo> findByPhone(TenantEntity tenantEntity, String phone) { | |||
| WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); | |||
| basicQ.setTenantId(tenantId); | |||
| basicQ.updateTenantInfo(tenantEntity); | |||
| basicQ.setPhone(phone); | |||
| List<WxCUserBasicInfo> 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<WxCUserBasicInfo> basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); | |||
| if (basicInfos.size() > 0) { | |||
| @@ -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 | |||
| @@ -138,7 +138,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { | |||
| } | |||
| record.setTags(JSON.toJSONString(record.getFilterList())); | |||
| List<WxCUserBasicInfo> userList = | |||
| wxCUserBasicInfoService.listByFilterList(record.getTenantId(),record.getFilterList()); | |||
| wxCUserBasicInfoService.listByFilterList(record,record.getFilterList()); | |||
| if(userList.isEmpty()){ | |||
| return new ResultData(ErrorCode.TAGS_MATCHED_NULL); | |||
| @@ -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<WxCouponPassword> 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<pwList.size();i++) { | |||
| WxCouponPassword newOne = new WxCouponPassword(); | |||
| newOne.setId(idWorker.nextId()); | |||
| newOne.setTenantId(tenantId); | |||
| newOne.updateTenantInfo(tenantEntity); | |||
| newOne.setCouponId(couponId); | |||
| newOne.setCouponShort(couponShortStr); | |||
| newOne.setPassword(pwList.get(i)); | |||
| @@ -342,7 +342,7 @@ import java.util.stream.Collectors; | |||
| if (record.getPasswordSupport() != null && record.getPasswordSupport().equals(EnumCouponPasswordSupport.SUPPORTED.getCode())) { | |||
| // 如果用户启用卡密,生成数据并保存 | |||
| couponPasswordService.mkPasswords(record.getTenantId(), record.getId(), record.getInventory()); | |||
| couponPasswordService.mkPasswords(record, record.getId(), record.getInventory()); | |||
| } | |||
| record.setCreateDate(new Date()); | |||
| @@ -226,7 +226,7 @@ public class WxMsgServiceImpl implements WxMsgService { | |||
| if (phones.isEmpty()) {//没有手工输入手机号时解析标签,有,继续流转 | |||
| List<WxCUserBasicInfo> 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()) {//解析之后手机号依然不存在时返回 | |||
| @@ -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<WxCUserBasicInfo> list = wxCUserBasicInfoService.findByPhone(user.getTenantId(), phone); | |||
| List<WxCUserBasicInfo> 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()); | |||