Merge branch 'gaohu_ar_coupon_order' into pre

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -105,5 +105,7 @@ public class KylinRedisConst {
     public static final String COUPON_COUNT = "kylin:coupon:count:";//$key + $uid:$performance_id
     public static final String MEMBER_COUNT = "kylin:member:count:";//$key + $uid:$performance_id
 
+    //订单关联 Ar激活码
+    public static final String ORDER_AR_CODE = "kylin:ar:order:";//$key + $orderId
 
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

@@ -70,4 +70,7 @@ public interface IKylinOrderTicketsService {
 
     //退款撤回
     ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId);
+
+    //获取 订单Ar激活码
+    ResponseDto<List<String>> getOrderArCode(String orderId);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.utils;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
@@ -504,4 +505,30 @@ public class DataUtils {
             return (String) obj;
         }
     }
+
+
+    //删除 订单Ar激活码
+    public void delOrderArCode(String orderId){
+        String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
+        redisDataSourceUtil.getRedisKylinUtil().del(rdk);
+    }
+
+    //添加 订单Ar激活码
+    public void addOrderArCode(String orderId,String arCode){
+        String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
+        List<String> data = getOrderArCode(orderId);
+        data.add(arCode);
+        redisDataSourceUtil.getRedisKylinUtil().set(rdk,data);
+    }
+
+    //获取 订单Ar激活码
+    public List<String> getOrderArCode(String orderId){
+        String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
+        Object obj =  redisDataSourceUtil.getRedisKylinUtil().get(rdk);
+        if(obj==null){
+            return CollectionUtil.arrayListString();
+        }else{
+            return (List<String>) obj;
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java

@@ -160,6 +160,13 @@ public class KylinOrderTicketsController {
         return orderTicketsService.orderTransferBack(orderId);
     }
 
+    @GetMapping("orderArCode")
+    @ApiOperation("获取订单Ar激活码")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<List<String>> orderArCode(@RequestParam(value = "orderId") String orderId) {
+        return orderTicketsService.getOrderArCode(orderId);
+    }
+
     /*@GetMapping("toOrderRefundDetails")
     @ApiOperation("想要退款订单详情")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

@@ -198,7 +198,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 orderTicketVo = dataUtils.getTransferOrder(uid);
             }
 
-            if(!SuperAccountUtils.isSuperAccount(uid,orderTicketVo.getUserId())){
+            if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
                 return null;
             }
 //            if (uid.equals("809406") || uid.equals("773650")) {
@@ -404,7 +404,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     public ResponseDto<Boolean> supplementEnter(String orderId, String enterList) {
         String uid = CurrentUtil.getCurrentUid();
         KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
-        if(!SuperAccountUtils.isSuperAccount(uid,orderTicketVo.getUserId())){
+        if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
         }
 //        if (uid.equals("809406") || uid.equals("773650")) {
@@ -1018,7 +1018,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
 
-            if(!SuperAccountUtils.isSuperAccount(uid,orderTicketVo.getUserId())){
+            if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
                 return ResponseDto.failure(ErrorMapping.get("20003"));
             }
 
@@ -1066,7 +1066,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
 
-            if(!SuperAccountUtils.isSuperAccount(uid,orderTicketVo.getUserId())){
+            if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
                 return ResponseDto.failure(ErrorMapping.get("20003"));
             }
 
@@ -1101,7 +1101,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
 
-            if(!SuperAccountUtils.isSuperAccount(uid,orderTicketVo.getUserId())){
+            if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
                 return "无权查看";
             }
 
@@ -1341,4 +1341,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         }
     }
 
+    @Override
+    public ResponseDto<List<String>> getOrderArCode(String orderId) {
+        KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+        String uid = CurrentUtil.getCurrentUid();
+        if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
+            return ResponseDto.failure("无权查看");
+        }
+        return ResponseDto.success(dataUtils.getOrderArCode(orderId));
+    }
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -1425,4 +1425,29 @@ public class DataUtils {
                 return false;
         }
     }
+
+    //删除 订单Ar激活码
+    public void delOrderArCode(String orderId){
+        String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
+        redisUtil.del(rdk);
+    }
+
+    //添加 订单Ar激活码
+    public void addOrderArCode(String orderId,String arCode){
+        String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
+        List<String> data = getOrderArCode(orderId);
+        data.add(arCode);
+        redisUtil.set(rdk,data);
+    }
+
+    //获取 订单Ar激活码
+    public List<String> getOrderArCode(String orderId){
+        String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
+        Object obj = redisUtil.get(rdk);
+        if(obj==null){
+            return CollectionUtil.arrayListString();
+        }else{
+            return (List<String>) obj;
+        }
+    }
 }