adam增加会员新接口

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

@@ -89,4 +89,12 @@ public class AdamMemberController {
         AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);
         return ResponseDto.success(null != userMemberInfo && userMemberInfo.isActive());
     }
+
+    @ApiOperationSupport(order = 98)
+    @ApiOperation(value = "@API:是否会员[新老]", notes = "AdamUserMemberVo")
+    @GetMapping("check/depth/new")
+    public ResponseDto<AdamUserMemberVo> isMemberNew(@NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
+        AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);
+        return ResponseDto.success(userMemberInfo);
+    }
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -158,12 +158,13 @@ public class OrderUtils {
     }
 
     public AdamUserMemberVo isMember(String uid) {
-        String resultData = HttpUtil.get(adamUrl + "/adam/member/check/depth?uid=" + uid, null);
-        AdamUserMemberVo vo = JsonUtils.fromJson(resultData, AdamUserMemberVo.class);
+        String resultData = HttpUtil.get(adamUrl + "/adam/member/check/depth/new?uid=" + uid, null);
+        ResponseDto<AdamUserMemberVo> vo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamUserMemberVo>>() {
+        });
 //        String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
 //        AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
-        if (null != vo && vo.isActive()) {
-            return vo;
+        if (null != vo.getData() && null != vo.getData().getUid() && vo.getData().isActive()) {
+            return vo.getData();
         } else {
             return null;
         }
@@ -172,12 +173,13 @@ public class OrderUtils {
 
     public AdamAddressesVo getAddress(String uid, String addressesId) {
         String resultData = HttpUtil.get(adamUrl + "/adam/addr/query/depth?uid=" + uid + "&addrId=" + addressesId, null);
-        AdamAddressesVo vos = JsonUtils.fromJson(resultData, AdamAddressesVo.class);
+        ResponseDto<AdamAddressesVo> vos = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamAddressesVo>>() {
+        });
 //        String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
 //        List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
 //        return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
-        if (null != vos) {
-            return vos;
+        if (null != vos.getData()) {
+            return vos.getData();
         } else {
             return null;
         }
@@ -185,12 +187,13 @@ public class OrderUtils {
 
     public AdamEntersVo getEnters(String uid, String entersId) {
         String resultData = HttpUtil.get(adamUrl + "/adam/enters/query/depth?uid=" + uid + "&entersId=" + entersId, null);
-        AdamEntersVo vos = JsonUtils.fromJson(resultData, AdamEntersVo.class);
+        ResponseDto<AdamEntersVo> vos = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamEntersVo>>() {
+        });
 //        String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
 //        List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
 //        return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
-        if (null != vos) {
-            return vos;
+        if (null != vos.getData()) {
+            return vos.getData();
         } else {
             return null;
         }

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

@@ -18,14 +18,12 @@ import org.springframework.util.MultiValueMap;
 public class InnerUtils {
     @Value("${liquidnet.service.adam.url}")
     private static String adamUrl;
-    @Value("${liquidnet.service.candy.url}")
-    private String candyUrl;
 
     public static AdamUserInfoSimpleVo getUserInfo() throws Exception {
         MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
         header.add("Accept", "application/json;charset=UTF-8");
         header.add("Authorization", "Bearer " + CurrentUtil.getToken());
-        String resultData = HttpUtil.post("http://devadam.zhengzai.tv"+"/adam/user/gif/mobile", null, header);
+        String resultData = HttpUtil.post(adamUrl + "/adam/user/gif/mobile", null, header);
         ResponseDto<AdamUserInfoSimpleVo> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamUserInfoSimpleVo>>() {
         });
         return innerReturnVo.getData();