提交 adam

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamRscPolymer01Vo.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Data
 public class AdamRscPolymer01Vo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -4945093532123934888L;
-    @ApiModelProperty(position = 1, value = "会员身份[0-非会员,1-会员]")
+    @ApiModelProperty(position = 1, value = "标记[0-普通用户｜2-过期会员｜10-老会员｜11-新会员]")
     private int membership;
     @ApiModelProperty(position = 2, value = "收货地址")
     private AdamAddressesVo addressesVo;

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

@@ -47,7 +47,7 @@ public class AdamRscController {
     })
     @PostMapping(value = {"reg/mobile"})
     public ResponseDto<AdamUserInfoVo> registerByMobile(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
-                                 @RequestParam String mobile) {
+                                                        @RequestParam String mobile) {
         AdamUserInfoVo userInfoVo;
         String uid = adamRdmService.getUidByMobile(mobile);
         if (StringUtils.isEmpty(uid)) {
@@ -71,14 +71,16 @@ public class AdamRscController {
 
     @ApiOperationSupport(order = 30)
     @ApiOperation(value = "@API:票务下单所需信息查询", notes = "包括是否会员、收货地址及入场人信息")
-    @GetMapping("inquire/of_buy_ticket")
+    @PostMapping("inquire/of_buy_ticket")
     public ResponseDto<AdamRscPolymer01Vo> queryForBuyTicket(@RequestParam(required = false) String addressId,
                                                              @RequestParam(required = false) String entersIds,
                                                              @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
         AdamRscPolymer01Vo vo = AdamRscPolymer01Vo.getNew();
 
         AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);
-        vo.setMembership((null != userMemberInfo && userMemberInfo.isActive()) ? 1 : 0);
+        AdamMemberVo memberVo = AdamMemberVo.getNew();
+        memberVo.setUserMemberVo(userMemberInfo);
+        vo.setMembership(memberVo.getStageMarker());
 
         if (!StringUtils.isEmpty(addressId)) {
             AdamAddressesVo addressesVo = adamRdmService.getAddressesVoByUidAddressesId(uid, addressId);