From 80336c5ce030f9032aa47cdbf40af2221d10e41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 15:43:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/constants/RedisConstant.java | 2 ++ .../com/cool/store/utils/RedisConstantUtil.java | 5 +++++ .../resources/mapper/HyPartnerLineInfoMapper.xml | 5 +++-- .../main/java/com/cool/store/vo/BlackListVO.java | 2 +- .../cool/store/service/impl/AliyunServiceImpl.java | 14 ++++++++++++++ .../service/impl/HyPartnerLineInfoServiceImpl.java | 9 ++++++--- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java index 688c01bec..381aff8ea 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java @@ -220,4 +220,6 @@ public class RedisConstant { public static final String DEVICE_OPEN_TOKEN = "device_open_token:{0}:{1}:{2}"; + public static final String PHONE_NUMBER= "phone_number_"; + } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java index 9ec5d9de8..2105a7c7b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java @@ -90,4 +90,9 @@ public class RedisConstantUtil { public String getRegionNameListKey(String eid, String regionId) { return active + "_" + RedisConstant.REGION_ALL_NAME_CACHE + eid + ":" + regionId; } + + public String getPhoneNumber(String phoneNumber) { + + return active + "_" + RedisConstant.PHONE_NUMBER + phoneNumber; + } } diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index f0dc5a367..836f5276b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -401,6 +401,7 @@ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java index 6804f4e45..51793bd36 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java @@ -19,7 +19,7 @@ public class BlackListVO { private Long id; @ApiModelProperty("加盟商用户ID") - private String partnerUserId; + private String partnerId; @ApiModelProperty("加盟商用户名称") private String partnerUserName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java index fcbd9bc8f..8642182a9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java @@ -13,11 +13,14 @@ import com.cool.store.enums.IDCardSideEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; import com.cool.store.service.AliyunService; +import com.cool.store.utils.RedisConstantUtil; +import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.cuser.IdentityCardInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; @@ -37,9 +40,18 @@ import java.util.Optional; @Service public class AliyunServiceImpl implements AliyunService { + @Resource + RedisUtilPool redisUtilPool; + @Resource + RedisConstantUtil redisConstantUtil; + @Override public DescribePhoneNumberDTO getPhoneNumberAttribute(String phoneNumber) { try { + String phone = redisUtilPool.getString(redisConstantUtil.getPhoneNumber(phoneNumber)); + if (StringUtils.isNotEmpty(phone)){ + return JSONObject.parseObject(phone, DescribePhoneNumberDTO.class); + } Config config = new Config(); //todo zcb ak sk替换 config.accessKeyId = "LTAI5t9RaXvABZbHvoXjDFJ1"; @@ -55,6 +67,8 @@ public class AliyunServiceImpl implements AliyunService { log.error("错误信息:" , response.body.message + ""); throw new ServiceException(ErrorCodeEnum.GET_PHONENUMBER_INFO_ERROR); } + //保存到redis + redisUtilPool.setString(redisConstantUtil.getPhoneNumber(phoneNumber),JSONObject.toJSONString(response.body.data)); return JSONObject.parseObject(JSONObject.toJSONString(response.body.data), DescribePhoneNumberDTO.class); } catch (Exception e) { log.error("获取手机号异常：", e); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index f24fe9f51..86e64a24c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -17,6 +17,7 @@ import com.cool.store.exception.ServiceException; import com.cool.store.request.CloseFollowRequest; import com.cool.store.request.LineRequest; import com.cool.store.request.PrivateSeaLineListRequest; +import com.cool.store.service.AliyunService; import com.cool.store.service.EnterpriseUserService; import com.cool.store.service.HyPartnerLineInfoService; import com.cool.store.utils.CoolDateUtils; @@ -58,6 +59,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { HyOpenAreaInfoDAO hyOpenAreaInfoDAO; @Resource EnterpriseUserService enterpriseUserService; + @Resource + AliyunService aliyunService; @Override public StageCountVO selectStagePendingCount(String userId) { @@ -286,8 +289,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { publicSeaLineListVo.setCreateTime(x.getCreateTime()); publicSeaLineListVo.setPartnerUserName(x.getUserName()); publicSeaLineListVo.setPartnerUserPhone(x.getMobile()); - // TODO: 2023/6/15 手机号归属地 - publicSeaLineListVo.setPhoneAddress(""); + DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(x.getMobile()); + publicSeaLineListVo.setPhoneAddress(phoneNumberAttribute.getCity()); publicSeaLineListVo.setWantShopArea(x.getWantShopArea()); publicSeaLineListVo.setId(x.getLineId()); publicSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType()); @@ -445,7 +448,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { public BlackListVO convertPartnerBlackListDTOToVo(PartnerBlackListDTO partnerBlackListDTO){ BlackListVO blackListVO = new BlackListVO(); blackListVO.setId(partnerBlackListDTO.getLineId()); - blackListVO.setPartnerUserId(partnerBlackListDTO.getPartnerId()); + blackListVO.setPartnerId(partnerBlackListDTO.getPartnerId()); blackListVO.setPartnerUserName(partnerBlackListDTO.getPartnerUserName()); blackListVO.setPartnerUserPhone(partnerBlackListDTO.getMobile()); blackListVO.setCreateTime(partnerBlackListDTO.getCreateTime()); From 34073bbb2046a6db8658360346b5bb9abac69588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 15:50:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-ab.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index 00252356c..0991b3bfc 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -68,4 +68,8 @@ xxl.job.executor.ip = xxl.job.executor.port = 31001 xxl.job.executor.logpath = logs/xxl-job/jobhandler xxl.job.executor.logretentiondays = 3 -xxl.job.accessToken = \ No newline at end of file +xxl.job.accessToken = + +hs.mdm.baseUrl=http://10.56.21.30/ +hs.mdm.appkey = HSAYPartner +hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3