Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -16,6 +16,8 @@ import com.liquidnet.service.stone.mapper.StoneScoreLogsMapper;
 import com.liquidnet.service.stone.mapper.StoneScoreUserMapper;
 import com.liquidnet.service.stone.vo.StoneUserVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
+import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
+import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -216,12 +218,20 @@ public class DataImpl {
     }
 
     public String getUnionIdByPhone(String phone) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE.concat(phone);
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_PHONE.concat(phone);
         Object obj = redisDataSourceUtil.getRedisSweetUtil().get(redisKey);
-        if (obj == null) {
+        if (null == obj) {
+            return null;
+        }
+        SweetAppletUsersVo sweetAppletUsers = (SweetAppletUsersVo) obj;
+
+        String redisKey2 = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS.concat(sweetAppletUsers.getUnionId())
+                .concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(2));
+        Object obj2 = redisDataSourceUtil.getRedisSweetUtil().get(redisKey2);
+        if (null == obj2) {
             return null;
         } else {
-            return (String) obj;
+            return "true";
         }
     }
 }