YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by zhengwen.ge
Commit f3f56ee1dd3bfcb9565a5d25024cbef52438771c 2 parents 5774c45e 40a71174

Merge branch '天创对接'

Inline Side-by-side
Showing 1 changed file with 12 additions and 13 deletions
... ... @@ -300,34 +300,33 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
value = yhValueOperations.get(key);
activeUnion.info("activateUnion with get redis first with key={}, value={}",key, value);
}
if (ClientTypeEnum.ANDROID.getName().equals(request.getClient_type())
&& StringUtils.isNotEmpty(td)
&& StringUtils.isEmpty(value)){
td = "samsung" + td;
key = UNION_KEY + "_" + request.getClientIp() + "_" + td + "_" + request.getAppkey();
value = yhValueOperations.get(key);
activeUnion.info("activateUnion with get redis second with key={}, value={}",key, value);
}
if (StringUtils.isEmpty(value)) {
String[] arr = request.getTd().split("_");
if (arr.length > 3) {
td=(arr[2] + "_" + arr[3]);
key = UNION_KEY + "_" + request.getClientIp() + "_" + td + "_" + request.getAppkey();
value = yhValueOperations.get(key);
activeUnion.info("activateUnion with get redis second with key={}, value={}", key, value);
activeUnion.info("activateUnion with get redis third with key={}, value={}", key, value);
}
if(arr.length==3){
td = (arr[1]+"_"+arr[2]);
key = UNION_KEY + "_" + request.getClientIp() + "_" + td + "_" + request.getAppkey();
value = yhValueOperations.get(key);
activeUnion.info("activateUnion with get redis third with key={}, value={}", key, value);
activeUnion.info("activateUnion with get redis fourth with key={}, value={}", key, value);
}
}
}
if (ClientTypeEnum.ANDROID.getName().equals(request.getClient_type())
&& StringUtils.isNotEmpty(td)
&& StringUtils.isEmpty(value)){
td = "samsung" + td;
key = UNION_KEY + "_" + request.getClientIp() + "_" + td + "_" + request.getAppkey();
value = yhValueOperations.get(key);
activeUnion.info("activateUnion with get redis first with key={}, value={}",key, value);
}
if (StringUtils.isEmpty(value)) {
if(StringUtils.isEmpty(request.getClientIp())){
value = null;
... ...