Merge branch 'hjc_goblin_list_fix' into pre

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin.yml

@@ -117,6 +117,7 @@ global-auth:
     - ${liquidnet.info.context}/nftTrade/**
     - ${liquidnet.info.context}/nftTradeQuery/**
     - ${liquidnet.info.context}/nftUser/**
+    - ${liquidnet.info.context}/nftGoods/payType
   oncheck-url-pattern:
     -
 # -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinGoodsAnticipateServiceImpl.java

@@ -230,6 +230,19 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             //mongodb缓存
 //            goblinMongoUtils.setHelpVo(helpVo);
 
+            //记录助力人数头像（前六个）
+            List<String> helpUserAvatar = goblinRedisUtils.getHelpUserAvatar(sid);
+            if (helpUserAvatar.size() <= 6) {
+                //获取用户头像保存
+                AdamUserInfoVo userInfo = goblinAnticipateUtils.getUserInfo();
+                if (userInfo!=null){
+                    //新增助力头像
+                    goblinRedisUtils.setHelpUserAvatar(sid, userInfo.getAvatar());
+                }else {
+                    return ResponseDto.failure(ErrorMapping.get(150008));
+                }
+            }
+
             //加入redis缓存
             Duration between = Duration.between(shareVo.getAboutStartDate(), shareVo.getAboutEndDate());
             goblinRedisUtils.setHelpByUidAndSid(uid, sid, between.toDays());
@@ -246,15 +259,6 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             });
             sendRedis("goblin_goods_anticipate_help", sqlValue);
 
-            //记录助力人数头像（前六个）
-            List<String> helpUserAvatar = goblinRedisUtils.getHelpUserAvatar(sid);
-            if (helpUserAvatar.size() <= 6) {
-                //获取用户头像保存
-                AdamUserInfoVo userInfo = goblinAnticipateUtils.getUserInfo();
-                //新增助力头像
-                goblinRedisUtils.setHelpUserAvatar(sid, userInfo.getAvatar());
-            }
-
             //判断主力人数是否达标，达标则自动预约
             if (shareVo.getPeopleType().equals(goblinRedisUtils.getHelpSidAddHelp(sid))){
                 //主力人数达到可预约条件

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/errors.properties

@@ -83,4 +83,5 @@
 150004=\u5DF2\u52A9\u529B\u8BE5\u5206\u4EAB
 150005=SKU\u4E0D\u5B58\u5728
 150006=\u9884\u7EA6\u672A\u5F00\u59CB\u6216\u5DF2\u7ED3\u675F
-150007=\u8BE5\u5546\u54C1\u9884\u7EA6\u5C1A\u672A\u5F00\u59CB\u6216\u5DF2\u7ECF\u7ED3\u675F\uFF0C\u4E0D\u53EF\u9884\u7EA6
\ No newline at end of file
+150007=\u8BE5\u5546\u54C1\u9884\u7EA6\u5C1A\u672A\u5F00\u59CB\u6216\u5DF2\u7ECF\u7ED3\u675F\uFF0C\u4E0D\u53EF\u9884\u7EA6
+150008=\u52A9\u7406\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5