diff --git a/fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/member/MemberRpcService.java b/fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/member/MemberRpcService.java index 46e2abf..fb22f0e 100644 --- a/fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/member/MemberRpcService.java +++ b/fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/member/MemberRpcService.java @@ -2,15 +2,10 @@ package cn.fw.valhalla.rpc.member; import cn.fw.data.base.domain.common.Message; import cn.fw.member.sdk.api.MemberApi; -import cn.fw.member.sdk.api.MemberInfoApi; -import cn.fw.member.sdk.api.UserWelfareApi; -import cn.fw.member.sdk.api.param.UserWelfareReq; -import cn.fw.member.sdk.api.result.DealerUserBaseInfo; import cn.fw.member.sdk.vo.BatchUserParam; import cn.fw.member.sdk.vo.UserBaseInfoVO; import cn.fw.member.sdk.vo.UserRegistryVO; import cn.fw.valhalla.rpc.member.dto.MemberUserDTO; -import cn.fw.valhalla.rpc.member.dto.MemberUserLevelDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -23,7 +18,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import static cn.fw.common.constant.CommonConstant.Symbol.EMPTY; import static org.apache.commons.lang3.Validate.isTrue; import static org.apache.commons.lang3.Validate.notNull; @@ -39,25 +33,13 @@ public class MemberRpcService { * 会员服务 */ private final MemberApi memberApi; - /** - * 会员level服务 - */ - private final MemberInfoApi memberInfoApi; - /** - * 会员level权益服务 - */ - private final UserWelfareApi userWelfareApi; /** * 默认构造器 */ @Autowired - public MemberRpcService(final MemberApi memberApi, - final MemberInfoApi memberInfoApi, - final UserWelfareApi userWelfareApi) { + public MemberRpcService(final MemberApi memberApi) { this.memberApi = memberApi; - this.memberInfoApi = memberInfoApi; - this.userWelfareApi = userWelfareApi; } /** @@ -150,29 +132,6 @@ public class MemberRpcService { } /** - * 根据cusId查询客户等级信息 - * - * @param cusId - * @param dealerId - * @return - */ - public MemberUserLevelDTO queryUserLevel(final Long cusId, final Long dealerId) { - - try { - Message msg = memberInfoApi.queryDealerUserInfo(cusId, dealerId); - isTrue(msg.isSuccess(), "查询会员等级失败,原因:{}", msg.getResult()); - DealerUserBaseInfo userBaseInfo = msg.getData(); - notNull(userBaseInfo, "客户不存在"); - MemberUserLevelDTO userLevelDTO = new MemberUserLevelDTO(); - BeanUtils.copyProperties(userBaseInfo, userLevelDTO); - return userLevelDTO; - } catch (Exception e) { - log.error("查询客户等级失败:{}", e); - return null; - } - } - - /** * 注册会员 * * @param memberUser 注册信息 @@ -192,30 +151,4 @@ public class MemberRpcService { return userDTO; } - /** - * 获取客户用户权益 - * - * @param userId 会员ID - * @param dealerId 商家ID - * @param welfareId 福利ID - */ - public String queryUserWelfareValue(final Long userId, final Long dealerId, final Long welfareId) { - final UserWelfareReq req = new UserWelfareReq(); - req.setUserId(userId); - req.setDealerId(dealerId); - req.setWelfareId(welfareId); - try { - Message msg = userWelfareApi.queryUserWelfareValue(req); - if (!msg.isSuccess() || StringUtils.isEmpty(msg.getData())) { - log.info("调用Member系统[查询商家[{}]会员[{}]福利[{}]],结果[{}]" - , userId, dealerId, welfareId, msg.getResult()); - return EMPTY; - } - return msg.getData(); - } catch (Exception e) { - e.printStackTrace(); - } - return EMPTY; - } - }