Skip to content

X
xyqb-user2
Commit e07c6218 authored by 唐峰's avatar 唐峰
Browse files
Options

剔除金融信息

parent b5cb0d74
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 123 deletions
src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java
View file @ e07c6218
...@@ -532,10 +532,6 @@ public class UserController implements IBaseController { ...@@ -532,10 +532,6 @@ public class UserController implements IBaseController {
} }
// 判断token是否存在 // 判断token是否存在
boolean exist = stringRedisTemplate.hasKey(tokenKey) || stringRedisTemplate.hasKey(tokenKey2); boolean exist = stringRedisTemplate.hasKey(tokenKey) || stringRedisTemplate.hasKey(tokenKey2);
if (!token.contains(prefix) && !exist) {
findTokenExchange(token, tenantId);
exist = stringRedisTemplate.hasKey(tokenKey) || stringRedisTemplate.hasKey(tokenKey2);
}
return JsonResult.buildSuccessResult("token valid", exist); return JsonResult.buildSuccessResult("token valid", exist);
} }
...@@ -563,7 +559,6 @@ public class UserController implements IBaseController { ...@@ -563,7 +559,6 @@ public class UserController implements IBaseController {
if (sessionStruct == null || sessionStruct.getValues() == null) { if (sessionStruct == null || sessionStruct.getValues() == null) {
// 使用token去电商查询信息, 如果token 不包含本系统token前缀 // 使用token去电商查询信息, 如果token 不包含本系统token前缀
if (!token.contains(prefix)) { if (!token.contains(prefix)) {
findTokenExchange(token, tenantId);
sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token, tenantId,registeredFrom); sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token, tenantId,registeredFrom);
if (sessionStruct == null || sessionStruct.getValues() == null) { if (sessionStruct == null || sessionStruct.getValues() == null) {
return JsonResult.buildSuccessResult(null, result); return JsonResult.buildSuccessResult(null, result);
...@@ -629,45 +624,7 @@ public class UserController implements IBaseController { ...@@ -629,45 +624,7 @@ public class UserController implements IBaseController {
} }
/**
* 交换token
*
* @param token
* @return
*/
private void findTokenExchange(String token, Integer tenantId) {
if (tenantId == null) {
tenantId = TenantUtil.TENANT_DEFAULT;
}
// 请求其他系统信息
HashMap<String, String> parameters = new HashMap<>();
HashMap<String, String> headers = new HashMap<>();
headers.put("qg-tenant-id", tenantId.toString());
parameters.put("token", token);
try {
String resultStr = httpService.post(userHost + "/api/finance-gateway/finance-user/finance/tokenExchange", headers, parameters);
JsonResult<TokenExchange> tokenExchangeResult = JSONObject.parseObject(resultStr, new TypeReference<JsonResult<TokenExchange>>() {
});
// 如果有返回值
TokenExchange tokenExchange = tokenExchangeResult.getData();
if (tokenExchange != null) {
SessionValue sessionValue = new SessionValue();
User user = userService.findById(tokenExchange.getUserId(), tenantId);
if (user != null) {
LoginProperties loginProperties = JSONObject.parseObject(tokenExchange.getLoginProperties(), LoginProperties.class);
// 根据返回值生成token, 返回值包含user:session:token的值
sessionValue.setUser(user);
sessionValue.setLoginProperties(loginProperties);
sessionService.persistSessionExchange(token, sessionValue, tokenExchange.getExpire(), tenantId);
}
}
} catch (Exception e) {
log.error("请求金融卡包网关出错--", e);
}
}
/** /**
* 用户中心首页，显示用户头像、昵称、姓名 * 用户中心首页，显示用户头像、昵称、姓名
......
src/main/java/cn/quantgroup/xyqb/service/user/impl/ModifyPhoneNoServiceImpl.java
View file @ e07c6218
...@@ -245,28 +245,11 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -245,28 +245,11 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
if (userRepository.findByPhoneNoAndTenantId(modifyPhoneNo.getCurPhoneNo(),tenantId) != null) { if (userRepository.findByPhoneNoAndTenantId(modifyPhoneNo.getCurPhoneNo(),tenantId) != null) {
throw new DataException("新手机号已存在，不支持更换。"); throw new DataException("新手机号已存在，不支持更换。");
} }
// 请求其他系统信息
HashMap<String, String> parameters = new HashMap<>(); User user = userService.findById(modifyPhoneNo.getUserId(),tenantId);
HashMap<String, String> headers = new HashMap<>(); userService.modifyPhoneNo(modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getCurPhoneNo(),user.getTenantId());
headers.put("qg-tenant-id", TenantUtil.TENANT_DEFAULT.toString()); modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal());
parameters.put("oldPhoneNo", modifyPhoneNo.getPrevPhoneNo()); modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.WAIT_4_USER_FEEDBACK.ordinal());
parameters.put("phoneNo", modifyPhoneNo.getCurPhoneNo());
parameters.put("exUserId", String.valueOf(modifyPhoneNo.getUserId()));
// parameters.put("remark", modifyPhoneNo.getApplyStatusReason());
parameters.put("changeRecord", Reason.SYNCHRONOUSCHANGE.toString());
String resultStr = httpService.postJson(userHost + "/api/finance-gateway/finance-user/shop/notify/changePhoneNo", headers, parameters);
JsonResult resultStrJson = JSONObject.parseObject(resultStr, JsonResult.class);
// 如果有返回值
if ("0000".equals(resultStrJson.getBusinessCode()) || "4014".equals(resultStrJson.getBusinessCode())) {
// 同步金融修改电商
User user = userService.findById(modifyPhoneNo.getUserId(),tenantId);
userService.modifyPhoneNo(modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getCurPhoneNo(),user.getTenantId());
modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal());
modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.WAIT_4_USER_FEEDBACK.ordinal());
} else {
String msg = resultStrJson.getMsg();
throw new DataException("金融返回失败" + (StringUtils.isNotBlank(msg) ? ":" + msg : ""));
}
} }
} }
...@@ -293,38 +276,14 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -293,38 +276,14 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
throw new DataException("原手机号填写不符"); throw new DataException("原手机号填写不符");
} }
// 请求其他系统信息
HashMap<String, String> parameters = new HashMap<>();
HashMap<String, String> headers = new HashMap<>();
headers.put("qg-tenant-id", TenantUtil.TENANT_DEFAULT.toString());
parameters.put("oldPhoneNo", modifyPhoneRecord.getPrevPhoneNo());
parameters.put("phoneNo", modifyPhoneRecord.getCurPhoneNo());
parameters.put("exUserId", String.valueOf(modifyPhoneRecord.getUserId()));
parameters.put("remark", modifyPhoneRecord.getRemark());
// todo: 记得映射
parameters.put("changeRecord", modifyPhoneRecord.getReason().toString());
String resultStr = httpService.postJson(userHost + "/api/finance-gateway/finance-user/shop/notify/changePhoneNo", headers, parameters);
JsonResult resultStrJson = JSONObject.parseObject(resultStr, JsonResult.class);
UserModifyPhoneRecord record = new UserModifyPhoneRecord(); UserModifyPhoneRecord record = new UserModifyPhoneRecord();
BeanUtils.copyProperties(modifyPhoneRecord, record); BeanUtils.copyProperties(modifyPhoneRecord, record);
// 如果有返回值 userService.submitModifyPhone(modifyPhoneRecord.getPrevPhoneNo(), modifyPhoneRecord.getCurPhoneNo(),modifyPhoneRecord.getTenantId());
if ("0000".equals(resultStrJson.getBusinessCode()) || "4014".equals(resultStrJson.getBusinessCode())) { record.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal());
// 同步金融修改电商 record.setFinancialResponse(null);
userService.submitModifyPhone(modifyPhoneRecord.getPrevPhoneNo(), modifyPhoneRecord.getCurPhoneNo(),modifyPhoneRecord.getTenantId()); modifyPhoneRecordRepository.saveAndFlush(record);
record.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal()); //登出此用户
record.setFinancialResponse(JSONObject.toJSONString(resultStrJson)); sessionService.deleteByUserId(user.getId(),modifyPhoneRecord.getTenantId());
modifyPhoneRecordRepository.saveAndFlush(record);
//登出此用户
sessionService.deleteByUserId(user.getId(),modifyPhoneRecord.getTenantId());
} else {
String msg = "金融返回失败" + (StringUtils.isNotBlank(resultStrJson.getMsg()) ? ":" + resultStrJson.getMsg() : "");
record.setApplyStatus(ModifyPhoneNoApplyStatusEnum.NO_ALLOW.ordinal());
record.setFinancialResponse(JSONObject.toJSONString(resultStrJson));
record.setApplyStatusReason(msg);
modifyPhoneRecordRepository.saveAndFlush(record);
throw new DataException(msg);
}
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -409,39 +368,18 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -409,39 +368,18 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
throw new DataException("原手机号填写不符"); throw new DataException("原手机号填写不符");
} }
// 请求其他系统信息
HashMap<String, String> parameters = new HashMap<>();
HashMap<String, String> headers = new HashMap<>();
headers.put("qg-tenant-id", TenantUtil.TENANT_DEFAULT.toString());
parameters.put("oldPhoneNo", modifyPhoneRecord.getPrevPhoneNo());
parameters.put("phoneNo", modifyPhoneRecord.getCurPhoneNo());
parameters.put("exUserId", String.valueOf(modifyPhoneRecord.getUserId()));
parameters.put("remark", modifyPhoneRecord.getRemark());
parameters.put("changeRecord", Reason.SYNCHRONOUSCHANGE.toString());
String resultStr = httpService.postJson(userHost + "/api/finance-gateway/finance-user/shop/notify/changePhoneNo", headers, parameters);
JsonResult resultStrJson = JSONObject.parseObject(resultStr, JsonResult.class);
UserModifyPhoneRecord record = new UserModifyPhoneRecord(); UserModifyPhoneRecord record = new UserModifyPhoneRecord();
BeanUtils.copyProperties(modifyPhoneRecord, record); BeanUtils.copyProperties(modifyPhoneRecord, record);
record.setApplySource(ApplySource.CLIENT); record.setApplySource(ApplySource.CLIENT);
record.setReason(Reason.ABANDONED); record.setReason(Reason.ABANDONED);
record.setOperator(String.valueOf(user.getId())); record.setOperator(String.valueOf(user.getId()));
// 如果有返回值
if ("0000".equals(resultStrJson.getBusinessCode()) || "4014".equals(resultStrJson.getBusinessCode())) { userService.submitModifyPhone(modifyPhoneRecord.getPrevPhoneNo(), modifyPhoneRecord.getCurPhoneNo(),modifyPhoneRecord.getTenantId());
// 同步金融修改电商 record.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal());
userService.submitModifyPhone(modifyPhoneRecord.getPrevPhoneNo(), modifyPhoneRecord.getCurPhoneNo(),modifyPhoneRecord.getTenantId()); record.setFinancialResponse(null);
record.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal()); modifyPhoneRecordRepository.saveAndFlush(record);
record.setFinancialResponse(JSONObject.toJSONString(resultStrJson)); //登出此用户
modifyPhoneRecordRepository.saveAndFlush(record); sessionService.deleteByUserId(user.getId(),modifyPhoneRecord.getTenantId());
//登出此用户
sessionService.deleteByUserId(user.getId(),modifyPhoneRecord.getTenantId());
} else {
String msg = "金融返回失败" + (StringUtils.isNotBlank(resultStrJson.getMsg()) ? ":" + resultStrJson.getMsg() : "");
record.setApplyStatus(ModifyPhoneNoApplyStatusEnum.NO_ALLOW.ordinal());
record.setFinancialResponse(JSONObject.toJSONString(resultStrJson));
record.setApplyStatusReason(msg);
modifyPhoneRecordRepository.saveAndFlush(record);
throw new DataException(msg);
}
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment