修改 config 和 adam的redis

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -53,6 +53,8 @@ liquidnet:
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
     order:
+      adam:
+        url: http://devadam.zhengzai.tv/adam
       url-pay:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -47,12 +47,15 @@ liquidnet:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
         callback: http://testadam.zhengzai.tv/adam/member/order/callback
+      url: http://devadam.zhengzai.tv/adam
     kylin:
       url-pay:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
     order:
+      adam:
+        url: http://testadam.zhengzai.tv/adam
       url-pay:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml

@@ -24,3 +24,5 @@ liquidnet:
     pay: ${liquidnet.service.order.url-pay.pay}
     check: ${liquidnet.service.order.url-pay.check}
     localUrl: ${liquidnet.service.order.url-pay.localUrl}
+  adam:
+    url:${liquidnet.service.order.adam.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml

@@ -24,3 +24,5 @@ liquidnet:
     pay: ${liquidnet.service.order.url-pay.pay}
     check: ${liquidnet.service.order.url-pay.check}
     localUrl: ${liquidnet.service.order.url-pay.localUrl}
+  adam:
+    url:${liquidnet.service.order.adam.url}

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

@@ -97,10 +97,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         boolean isDownGeneral = false;
         List<AdamEntersVo> entersVoList = ObjectUtil.cloneArrayListObject();
         String uid = CurrentUtil.getCurrentUid();
-        String lock = "userId:" + uid;
-//        if (!redisLockUtil.tryLock(lock, 1, 5)) {
-//            return ResponseDto.failure(ErrorMapping.get("20023"));//参数错误
-//        }
         try {
             currentTime = System.currentTimeMillis();
             KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(payOrderParam.getPerformanceId());

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

 package com.liquidnet.service.order.utils;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
+import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -19,8 +25,8 @@ public class OrderUtils {
 
     @Autowired
     private DataUtils dataUtils;
-    @Autowired
-    private RedisUtil redisUtil;
+    @Value("${liquidnet.adam.url}")
+    private String adamUrl;
 
     public String judgeOrderLimit(
             int type,
@@ -63,8 +69,8 @@ public class OrderUtils {
             ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
         }
         Integer[] array = ObjectUtil.cloneInteger2Array();
-        array[0]=performanceBuyCount;
-        array[1]=ticketBuyCount;
+        array[0] = performanceBuyCount;
+        array[1] = ticketBuyCount;
         return array;
     }
 
@@ -86,8 +92,8 @@ public class OrderUtils {
         }
 
         Integer[] array = ObjectUtil.cloneInteger2Array();
-        array[0]=performanceBuyCount;
-        array[1]=ticketBuyCount;
+        array[0] = performanceBuyCount;
+        array[1] = ticketBuyCount;
         return array;
     }
 
@@ -111,20 +117,23 @@ public class OrderUtils {
     }
 
     public boolean isMember(String uid) {
-        String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
-        AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
+        String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
+        AdamUserMemberVo vo = JsonUtils.fromJson(resultData, AdamUserMemberVo.class);
         return null != vo && vo.isActive();
     }
 
+
     public AdamAddressesVo getAddress(String uid, String addressesId) {
-        String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
-        List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
+        String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
+        List<AdamAddressesVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamAddressesVo>>() {
+        });
         return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
 
     public AdamEntersVo getEnters(String uid, String entersId) {
-        String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
-        List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
+        String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
+        List<AdamEntersVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamEntersVo>>() {
+        });
         return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }