记得上下班打卡 | git大法好,push需谨慎

Commit e3075a6c authored by 胡佳晨's avatar 胡佳晨

提交order 不访问redis

parent 8388fb28
...@@ -47,8 +47,6 @@ public class OrderUtils { ...@@ -47,8 +47,6 @@ public class OrderUtils {
private String candyUrl; private String candyUrl;
@Value("${liquidnet.service.stone.url}") @Value("${liquidnet.service.stone.url}")
private String stoneUrl; private String stoneUrl;
@Autowired
private RedisUtil redisUtil;
public String judgeOrderLimit( public String judgeOrderLimit(
int type, int type,
...@@ -156,15 +154,14 @@ public class OrderUtils { ...@@ -156,15 +154,14 @@ public class OrderUtils {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString(); MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("taskId", "1"); params.add("taskId", "1");
params.add("uid", uid); params.add("uid", uid);
String resultData = HttpUtil.post("http://devstone.zhengzai.tv" + "/user/inner/doTask", params, header); String resultData = HttpUtil.post(stoneUrl + "/user/inner/doTask", params, header);
} }
public AdamUserMemberVo isMember(String uid) { public AdamUserMemberVo isMember(String uid) {
// String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null); String resultData = HttpUtil.get(adamUrl + "/adam/member/check/depth?uid=" + uid, null);
// AdamUserMemberVo vo = JsonUtils.fromJson(resultData, AdamUserMemberVo.class); AdamUserMemberVo vo = JsonUtils.fromJson(resultData, AdamUserMemberVo.class);
// String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid); // AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
if (null != vo && vo.isActive()) { if (null != vo && vo.isActive()) {
return vo; return vo;
} else { } else {
...@@ -174,21 +171,29 @@ public class OrderUtils { ...@@ -174,21 +171,29 @@ public class OrderUtils {
public AdamAddressesVo getAddress(String uid, String addressesId) { public AdamAddressesVo getAddress(String uid, String addressesId) {
// String resultData = HttpUtil.get("/adam/addr/query/depth?uid=" + uid + "&addrId=" + addressesId, null); String resultData = HttpUtil.get(adamUrl + "/adam/addr/query/depth?uid=" + uid + "&addrId=" + addressesId, null);
// List<AdamAddressesVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamAddressesVo>>() { AdamAddressesVo vos = JsonUtils.fromJson(resultData, AdamAddressesVo.class);
// }); // String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid); // List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk); // return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null); if (null != vos) {
return vos;
} else {
return null;
}
} }
public AdamEntersVo getEnters(String uid, String entersId) { public AdamEntersVo getEnters(String uid, String entersId) {
// String resultData = HttpUtil.get("/adam/enters/query/depth?uid=" + uid + "&entersId=" + entersId, null); String resultData = HttpUtil.get(adamUrl + "/adam/enters/query/depth?uid=" + uid + "&entersId=" + entersId, null);
// List<AdamEntersVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamEntersVo>>() { AdamEntersVo vos = JsonUtils.fromJson(resultData, AdamEntersVo.class);
// }); // String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
String rk = AdamRedisConst.INFO_ENTERS.concat(uid); // List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk); // return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null); if (null != vos) {
return vos;
} else {
return null;
}
} }
/** /**
......
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