+API:服务内部调用入场人、会员信息查询;

liquidnet-bus-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/api/FeignAdamBaseClient.java

@@ -7,6 +7,7 @@ import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.ResponseDto;
 import feign.hystrix.FallbackFactory;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +26,9 @@ import java.util.List;
         fallback = FallbackFactory.Default.class)
 public interface FeignAdamBaseClient {
 
+    /**
+     * 不推荐使用，建议使用`rsc/inquire/enters`
+     */
     @GetMapping("enters/query/depth")
     ResponseDto<AdamEntersVo> queryEnters(@RequestParam("entersId") String entersId,
                                           @RequestParam("uid") String uid);
@@ -33,22 +37,40 @@ public interface FeignAdamBaseClient {
     ResponseDto<AdamAddressesVo> queryAddresses(@RequestParam(value = "addrId") String addrId,
                                                 @RequestParam(value = "uid") String uid);
 
+    /* -------------------------------------------------------------------- */
+
     @PostMapping("rsc/inquire/cuinfo")
     ResponseDto<List<AdamChimeUinfoDto>> queryForChimeUserInfo(@RequestBody AdamChimeUinfoReq req);
 
     @PostMapping("rsc/inquire/sendMsgToRedis")
-    ResponseDto<Boolean> sendMsgToRedis(@RequestParam("redisKey") String redisKey,@RequestParam("jsonParamStr") String jsonParamStr);
+    ResponseDto<Boolean> sendMsgToRedis(@RequestParam("redisKey") String redisKey, @RequestParam("jsonParamStr") String jsonParamStr);
 
     @PostMapping(value = {"rsc/reg/mobile"})
     ResponseDto<AdamUserInfoVo> registerByMobile(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
-                                                        @RequestParam(value = "mobile") String mobile);
+                                                 @RequestParam(value = "mobile") String mobile);
+
+    /**
+     * 入场人信息查取
+     *
+     * @param entersIds List<String>:入场人ID集合
+     * @param uid       用户ID
+     * @return ResponseDto<List < AdamEntersVo>>
+     */
+    @GetMapping("rsc/inquire/enters")
+    ResponseDto<List<AdamEntersVo>> querysEnters(@NotBlank(message = "入场人ID不能为空（多个ID以,分隔）") @RequestParam List<String> entersIds,
+                                                    @NotBlank(message = "用户ID不能为空") @RequestParam String uid);
+
+    @GetMapping("rsc/inquire/member")
+    ResponseDto<AdamUserMemberVo> queryMember(@NotBlank(message = "用户ID不能为空") @RequestParam String uid);
+
+    /* -------------------------------------------------------------------- */
 
     @PostMapping(value = {"login/silent_mobile"})
     ResponseDto<AdamLoginInfoVo> loginBySilentMobile(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
-                                                    @NotBlank(message = "手机号不能为空")
-                                                    @RequestParam(value = "mobile") String mobile,
+                                                     @NotBlank(message = "手机号不能为空")
+                                                     @RequestParam(value = "mobile") String mobile,
                                                      @NotBlank(message = "临时票据不能为空")
-                                                    @RequestParam(value = "otp") String otp);
+                                                     @RequestParam(value = "otp") String otp);
 
     @GetMapping(value = "member/check/depth", headers = {"Inner-Required=1"})
     ResponseDto<Boolean> isMember(@NotBlank(message = "用户ID不能为空") @RequestParam(value = "uid") String uid);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Pattern;
@@ -204,7 +205,7 @@ public class AdamEntersController {
     @ApiOperation(value = "入场人详情")
     @PostMapping("query")
     public ResponseDto<List<AdamEntersVo>> query(@NotBlank(message = "入场人ID不能为空") @RequestParam String entersIds) {
-        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUidEntersIds(CurrentUtil.getCurrentUid(), entersIds.split(","));
+        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUidEntersIds(CurrentUtil.getCurrentUid(), Arrays.asList(entersIds.split(",")));
         if (!CollectionUtils.isEmpty(vos)) {
             for (AdamEntersVo vo : vos) {
                 vo.setName(SensitizeUtil.chineseName(vo.getName()));
@@ -231,7 +232,7 @@ public class AdamEntersController {
     /* ------------------------------------------------------------｜@API:RSC */
 
     @ApiOperationSupport(order = 99)
-    @ApiOperation(value = "@API:入场人详情", notes = "查取用户指定入场人详情，响应说明[`success`: true-成功返回信息,false-未查询到信息]")
+    @ApiOperation(value = "不推荐使用@API:入场人详情", notes = "不推荐使用，建议使用`rsc/inquire/enters`")
     @GetMapping("query/depth")
     public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank(message = "入场人ID不能为空") @RequestParam String entersId,
                                                    @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -175,7 +175,7 @@ public class AdamMemberController {
     }
 
     @ApiOperationSupport(order = 98)
-    @ApiOperation(value = "@API:是否会员[新老]", notes = "AdamUserMemberVo")
+    @ApiOperation(value = "不推荐使用@API:是否会员[新老]", notes = "不推荐使用，建议使用`rsc/inquire/member`")
     @GetMapping("check/depth/new")
     public ResponseDto<AdamUserMemberVo> isMemberNew(@NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
         AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamRscController.java

@@ -24,8 +24,10 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @ApiSupport(order = 10080)
@@ -67,12 +69,19 @@ public class AdamRscController {
     @ApiOperationSupport(order = 20)
     @ApiOperation(value = "@API:入场人列表", notes = "查取用户指定入场人列表")
     @GetMapping("inquire/enters")
-    public ResponseDto<List<AdamEntersVo>> querysForDepth(@NotBlank(message = "入场人ID不能为空（多个ID以,分隔）") @RequestParam String entersIds,
+    public ResponseDto<List<AdamEntersVo>> querysEnters(@NotNull(message = "入场人ID不能为空") @RequestParam List<String> entersIds,
                                                           @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
-        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUidEntersIds(uid, entersIds.split(","));
+        List<AdamEntersVo> vos = entersIds.isEmpty() ? null : adamRdmService.getEntersVoByUidEntersIds(uid, entersIds);
         return CollectionUtils.isEmpty(vos) ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vos);
     }
 
+    @ApiOperationSupport(order = 21)
+    @ApiOperation(value = "@API:会员信息[新老]", notes = "AdamUserMemberVo")
+    @GetMapping("inquire/member")
+    public ResponseDto<AdamUserMemberVo> queryMember(@NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
+        return ResponseDto.success(adamRdmService.getUserMemberVoByUid(uid));
+    }
+
     @ApiOperationSupport(order = 30)
     @ApiOperation(value = "@API:票务下单所需信息查询", notes = "包括是否会员、收货地址及入场人信息")
     @PostMapping("inquire/of_buy_ticket")
@@ -92,7 +101,7 @@ public class AdamRscController {
         }
 
         if (!StringUtils.isEmpty(entersIds)) {
-            List<AdamEntersVo> entersVos = adamRdmService.getEntersVoByUidEntersIds(uid, entersIds.split(","));
+            List<AdamEntersVo> entersVos = adamRdmService.getEntersVoByUidEntersIds(uid, Arrays.asList(entersIds.split(",")));
             vo.setEntersVos(entersVos);
         }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -384,10 +384,10 @@ public class AdamRdmService {
         return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
 
-    public List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds) {
-        List<String> entersIdList = Arrays.asList(entersIds);
+    public List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, List<String> entersIds) {
+//        List<String> entersIdList = Arrays.asList(entersIds);
         List<AdamEntersVo> vos = this.getEntersVoByUid(uid);
-        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> entersIdList.contains(r.getEntersId())).collect(Collectors.toList());
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> entersIds.contains(r.getEntersId())).collect(Collectors.toList());
     }
 
     public void delEntersVoByUid(String uid) {