Commit 8d2469379d1c0929bc87e7d138fcc56782ef9a3b

Authored by 张志伟
1 parent 03c1a9b3

会员系统更新

fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/member/MemberRpcService.java
@@ -2,15 +2,10 @@ package cn.fw.valhalla.rpc.member; @@ -2,15 +2,10 @@ package cn.fw.valhalla.rpc.member;
2 2
3 import cn.fw.data.base.domain.common.Message; 3 import cn.fw.data.base.domain.common.Message;
4 import cn.fw.member.sdk.api.MemberApi; 4 import cn.fw.member.sdk.api.MemberApi;
5 -import cn.fw.member.sdk.api.MemberInfoApi;  
6 -import cn.fw.member.sdk.api.UserWelfareApi;  
7 -import cn.fw.member.sdk.api.param.UserWelfareReq;  
8 -import cn.fw.member.sdk.api.result.DealerUserBaseInfo;  
9 import cn.fw.member.sdk.vo.BatchUserParam; 5 import cn.fw.member.sdk.vo.BatchUserParam;
10 import cn.fw.member.sdk.vo.UserBaseInfoVO; 6 import cn.fw.member.sdk.vo.UserBaseInfoVO;
11 import cn.fw.member.sdk.vo.UserRegistryVO; 7 import cn.fw.member.sdk.vo.UserRegistryVO;
12 import cn.fw.valhalla.rpc.member.dto.MemberUserDTO; 8 import cn.fw.valhalla.rpc.member.dto.MemberUserDTO;
13 -import cn.fw.valhalla.rpc.member.dto.MemberUserLevelDTO;  
14 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
15 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
16 import org.springframework.beans.BeanUtils; 11 import org.springframework.beans.BeanUtils;
@@ -23,7 +18,6 @@ import java.util.Collections; @@ -23,7 +18,6 @@ import java.util.Collections;
23 import java.util.List; 18 import java.util.List;
24 import java.util.Objects; 19 import java.util.Objects;
25 20
26 -import static cn.fw.common.constant.CommonConstant.Symbol.EMPTY;  
27 import static org.apache.commons.lang3.Validate.isTrue; 21 import static org.apache.commons.lang3.Validate.isTrue;
28 import static org.apache.commons.lang3.Validate.notNull; 22 import static org.apache.commons.lang3.Validate.notNull;
29 23
@@ -39,25 +33,13 @@ public class MemberRpcService { @@ -39,25 +33,13 @@ public class MemberRpcService {
39 * 会员服务 33 * 会员服务
40 */ 34 */
41 private final MemberApi memberApi; 35 private final MemberApi memberApi;
42 - /**  
43 - * 会员level服务  
44 - */  
45 - private final MemberInfoApi memberInfoApi;  
46 - /**  
47 - * 会员level权益服务  
48 - */  
49 - private final UserWelfareApi userWelfareApi;  
50 36
51 /** 37 /**
52 * 默认构造器 38 * 默认构造器
53 */ 39 */
54 @Autowired 40 @Autowired
55 - public MemberRpcService(final MemberApi memberApi,  
56 - final MemberInfoApi memberInfoApi,  
57 - final UserWelfareApi userWelfareApi) { 41 + public MemberRpcService(final MemberApi memberApi) {
58 this.memberApi = memberApi; 42 this.memberApi = memberApi;
59 - this.memberInfoApi = memberInfoApi;  
60 - this.userWelfareApi = userWelfareApi;  
61 } 43 }
62 44
63 /** 45 /**
@@ -150,29 +132,6 @@ public class MemberRpcService { @@ -150,29 +132,6 @@ public class MemberRpcService {
150 } 132 }
151 133
152 /** 134 /**
153 - * 根据cusId查询客户等级信息  
154 - *  
155 - * @param cusId  
156 - * @param dealerId  
157 - * @return  
158 - */  
159 - public MemberUserLevelDTO queryUserLevel(final Long cusId, final Long dealerId) {  
160 -  
161 - try {  
162 - Message<DealerUserBaseInfo> msg = memberInfoApi.queryDealerUserInfo(cusId, dealerId);  
163 - isTrue(msg.isSuccess(), "查询会员等级失败,原因:{}", msg.getResult());  
164 - DealerUserBaseInfo userBaseInfo = msg.getData();  
165 - notNull(userBaseInfo, "客户不存在");  
166 - MemberUserLevelDTO userLevelDTO = new MemberUserLevelDTO();  
167 - BeanUtils.copyProperties(userBaseInfo, userLevelDTO);  
168 - return userLevelDTO;  
169 - } catch (Exception e) {  
170 - log.error("查询客户等级失败:{}", e);  
171 - return null;  
172 - }  
173 - }  
174 -  
175 - /**  
176 * 注册会员 135 * 注册会员
177 * 136 *
178 * @param memberUser 注册信息 137 * @param memberUser 注册信息
@@ -192,30 +151,4 @@ public class MemberRpcService { @@ -192,30 +151,4 @@ public class MemberRpcService {
192 return userDTO; 151 return userDTO;
193 } 152 }
194 153
195 - /**  
196 - * 获取客户用户权益  
197 - *  
198 - * @param userId 会员ID  
199 - * @param dealerId 商家ID  
200 - * @param welfareId 福利ID  
201 - */  
202 - public String queryUserWelfareValue(final Long userId, final Long dealerId, final Long welfareId) {  
203 - final UserWelfareReq req = new UserWelfareReq();  
204 - req.setUserId(userId);  
205 - req.setDealerId(dealerId);  
206 - req.setWelfareId(welfareId);  
207 - try {  
208 - Message<String> msg = userWelfareApi.queryUserWelfareValue(req);  
209 - if (!msg.isSuccess() || StringUtils.isEmpty(msg.getData())) {  
210 - log.info("调用Member系统[查询商家[{}]会员[{}]福利[{}]],结果[{}]"  
211 - , userId, dealerId, welfareId, msg.getResult());  
212 - return EMPTY;  
213 - }  
214 - return msg.getData();  
215 - } catch (Exception e) {  
216 - e.printStackTrace();  
217 - }  
218 - return EMPTY;  
219 - }  
220 -  
221 } 154 }