Authored by caoyan

Merge branch 'dev6.8.6.5-quality4app' into test6.8.6.5

@@ -328,7 +328,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -328,7 +328,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
328 public ProductIdentifyResp queryNewIdentifyInfo(String tagId, String nfcUid, Integer uid) throws GatewayException { 328 public ProductIdentifyResp queryNewIdentifyInfo(String tagId, String nfcUid, Integer uid) throws GatewayException {
329 logger.info("enter queryNewIdentifyInfo, tagId = {}, nfcUid={}, uid={}", tagId, nfcUid, uid); 329 logger.info("enter queryNewIdentifyInfo, tagId = {}, nfcUid={}, uid={}", tagId, nfcUid, uid);
330 //返回结果可能在缓存中 330 //返回结果可能在缓存中
331 - ProductIdentifyResp result = getIdentifyFromCache(tagId, nfcUid); 331 + ProductIdentifyResp result = getNewIdentifyFromCache(tagId, nfcUid);
332 if(result != null ){ 332 if(result != null ){
333 rebuildResult(result, tagId, nfcUid, uid); 333 rebuildResult(result, tagId, nfcUid, uid);
334 logger.info("queryNewIdentifyInfo get result from cache success! tagId = {}, nfcUid={},uid={}, result={} ", tagId, nfcUid, uid, result ); 334 logger.info("queryNewIdentifyInfo get result from cache success! tagId = {}, nfcUid={},uid={}, result={} ", tagId, nfcUid, uid, result );
@@ -842,6 +842,13 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -842,6 +842,13 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
842 return identifyResp; 842 return identifyResp;
843 } 843 }
844 844
  845 + private ProductIdentifyResp getNewIdentifyFromCache(String tagId, String nfcUid) {
  846 + RedisKeyBuilder kb = new RedisKeyBuilder().appendFixed("ufo:product:newIdentifyResultInfo:").
  847 + appendVar(tagId).appendVar(":").appendVar(nfcUid);
  848 + ProductIdentifyResp identifyResp = clientCache.get(kb, ProductIdentifyResp.class);
  849 + return identifyResp;
  850 + }
  851 +
845 /** 852 /**
846 * 查询用户基本信息--头像信息(不要取此接口的手机号) 853 * 查询用户基本信息--头像信息(不要取此接口的手机号)
847 * @return 854 * @return