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

liquidnet-bus-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/constant/StoneConstant.java

@@ -24,4 +24,7 @@ public class StoneConstant {
     //限购
     public static final String ITEM_LIMIT = ITEM.concat("limit:");
 
+    //锁
+    public static final String LOCK = ITEM.concat("lock:");
+
 }

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

@@ -71,11 +71,14 @@ public class DataImpl {
             for (AdamUser item : adamUserList) {
                 //获取用户相关信息
                 String uid = item.getUid();
-                String mobile = item.getMobile();
                 AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.INFO_USER.concat(uid));
                 if (userInfoVo == null) {
                     continue;
                 }
+                String mobile = userInfoVo.getMobile();
+                if (mobile == null) {
+                    continue;
+                }
                 int score = 0;
                 //创建 用户积分数据
                 int isExists = stoneScoreUserMapper.selectCount(Wrappers.lambdaQuery(StoneScoreUser.class).eq(StoneScoreUser::getUid, uid));
@@ -272,6 +275,7 @@ public class DataImpl {
     }
 
     private String getUnionIdByPhone(String phone) {
+        log.info("mobile = " + phone);
         String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_PHONE.concat(phone);
         Object obj = redisDataSourceUtil.getRedisSweetUtil().get(redisKey);
         if (null == obj) {

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreLogsServiceImpl.java

@@ -282,8 +282,8 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
         logs.setUid(uid);
         logs.setScore(BigDecimal.valueOf(score));
         logs.setCreatedAt(LocalDateTime.now());
-        stoneMongoUtils.logCreate(logs);
         stoneRedisUtils.addLogsList(uid,logs);
+        stoneMongoUtils.logCreate(logs);
         //mysql 入库 积分日志
         queueUtils.sendMsgByRedis(MQConst.StoneQueue.STONE_INSERT_LOGS.getKey(),
                 SqlMapping.get("stone_score_logs.insert", logs.getLogsId(), logs.getUid(), logs.getScore(), logs.getContent(), logs.getReason(), getOverdueAt(), LocalDateTime.now())
@@ -302,8 +302,8 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
         logs.setUid(uid);
         logs.setScore(BigDecimal.valueOf(score).negate());
         logs.setCreatedAt(LocalDateTime.now());
-        stoneMongoUtils.logCreate(logs);
         stoneRedisUtils.addLogsList(uid,logs);
+        stoneMongoUtils.logCreate(logs);
         //mysql 入库 积分日志
         queueUtils.sendMsgByRedis(MQConst.StoneQueue.STONE_INSERT_LOGS.getKey(),
                 SqlMapping.get("stone_score_logs.insert", logs.getLogsId(), logs.getUid(), logs.getScore(), logs.getContent(), logs.getReason(), getOverdueAt(), LocalDateTime.now())

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/util/StoneRedisUtils.java

@@ -312,4 +312,15 @@ public class StoneRedisUtils {
             return (List<StoneOrderListVo>) obj;
         }
     }
+
+
+    public boolean lockUid(String uid){
+        String redisKey = StoneConstant.LOCK.concat(uid);
+        return redisUtil.lock(uid,1,1);
+    }
+
+    public void unLockUid(String uid){
+        String redisKey = StoneConstant.LOCK.concat(uid);
+        redisUtil.uLock(redisKey);
+    }
 }