Merge branch 'dev-0712activity' into dev_0716_online

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

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+
+/**
+ * ar前端接口
+ */
+public interface IKylinArActiveService {
+    /**
+     * 兑换
+     * @param code
+     * @param uid
+     * @return
+     */
+    ResponseDto exchange(String code, String uid);
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinAcitveService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinAcitveService.java

-package com.liquidnet.service.kylin.service;
+package com.liquidnet.service.kylin.service.admin;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.KylinAcitve;
 
 import java.util.List;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTicketActiveService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinTicketActiveService.java

-package com.liquidnet.service.kylin.service;
+package com.liquidnet.service.kylin.service.admin;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.kylin.dao.KylinTicketActive;
 
 import java.util.List;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinAcitveServiceImpl.java

@@ -11,8 +11,8 @@ import com.liquidnet.service.kylin.dao.KylinAcitve;
 import com.liquidnet.service.kylin.dao.KylinTicketActive;
 import com.liquidnet.service.kylin.mapper.KylinAcitveMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketActiveMapper;
-import com.liquidnet.service.kylin.service.IKylinAcitveService;
-import com.liquidnet.service.kylin.service.IKylinTicketActiveService;
+import com.liquidnet.service.kylin.service.admin.IKylinTicketActiveService;
+import com.liquidnet.service.kylin.service.admin.IKylinAcitveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +62,7 @@ public class KylinAcitveServiceImpl extends ServiceImpl<KylinAcitveMapper, Kylin
             return list;
     }
 
+
     public List<KylinTicketActive> getKylinTicketActive(int number,String activeId){
         List<KylinTicketActive> list = new ArrayList<>();
         if(number>0){

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinTicketActiveServiceImpl.java

@@ -7,7 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.ActiveTicketExportVo;
 import com.liquidnet.service.kylin.dao.KylinTicketActive;
 import com.liquidnet.service.kylin.mapper.KylinTicketActiveMapper;
-import com.liquidnet.service.kylin.service.IKylinTicketActiveService;
+import com.liquidnet.service.kylin.service.admin.IKylinTicketActiveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.controller;
 
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.service.impl.BannersServiceImpl;
+import com.liquidnet.service.kylin.service.impl.KylinArActiveServiceImpl;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,14 +26,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("arActive")
 @Slf4j
 public class KylinArActiveController {
-
     @Autowired
-    private BannersServiceImpl bannersServiceImpl;
+    private KylinArActiveServiceImpl kylinArActiveService;
     @Autowired
     private DataUtils dataUtils;
 
     @PostMapping("getUserStatus")
-    @ApiOperation("查看用户是否绑定(0没有绑定、1绑定了、2失效，目前失效没有用)")
+    @ApiOperation("查看用户是否绑定(0没有绑定、1绑定了、2失效[目前失效没有用]")
     public ResponseDto<String> getUserStatus() {
         String uid = CurrentUtil.getCurrentUid();
         if(null==dataUtils.getUserStatus(uid)){
@@ -46,14 +45,8 @@ public class KylinArActiveController {
     @ApiOperation("兑换码兑换")
     public ResponseDto<String> exchangeCode(@RequestParam(value = "code")String code) {
         String uid = CurrentUtil.getCurrentUid();
-
-        if(null==dataUtils.getUserStatus(uid)){
-            return  ResponseDto.success("0");
-        }else{
-            return   ResponseDto.success(dataUtils.getUserStatus(uid));
-        }
+        return kylinArActiveService.exchange(code,uid);
     }
 
 
-
 }

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

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.kylin.dao.KylinTicketActive;
+import com.liquidnet.service.kylin.service.IKylinArActiveService;
+import com.liquidnet.service.kylin.utils.DataUtils;
+import com.liquidnet.service.kylin.utils.QueueUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 人流量检测记录表 服务实现类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2022-01-10
+ */
+@Service
+public class KylinArActiveServiceImpl implements IKylinArActiveService {
+    @Autowired
+    private DataUtils dataUtils;
+    @Autowired
+    private QueueUtils queueUtils;
+    @Override
+    public ResponseDto exchange(String code, String uid) {
+        //1 查看是否有兑换码
+        KylinTicketActive kylinTicketActive=dataUtils.getArTicket(code);
+        if(null==kylinTicketActive){
+            return ResponseDto.failure("兑换码错误");
+        }
+        //2、查看该用户是否绑定
+        if(null!=dataUtils.getUserStatus(uid)){
+            return ResponseDto.failure("该用户已经绑定");
+        }
+        //判断是否用过卷了
+        if(kylinTicketActive.getState()==2){
+            return ResponseDto.failure("该券已经兑换");
+        }
+        //开始绑定
+        //修改redis缓存
+        dataUtils.setUser(uid,"1");
+        kylinTicketActive.setState(2);
+        dataUtils.setArTicket(kylinTicketActive);
+        //队列 修改券的状态。
+        queueUtils.sendMsgByRedis(
+                MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
+                SqlMapping.get(
+                        "kylin_ar_ticket.update",
+                        new Object[]{
+                            2,uid, LocalDateTime.now(),code
+                        }
+                ));
+        return ResponseDto.success();
+    }
+}

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

@@ -8,6 +8,7 @@ import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
+import com.liquidnet.service.kylin.dao.KylinTicketActive;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
 import com.liquidnet.service.kylin.dto.vo.WqTempVo;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
@@ -1221,5 +1222,18 @@ public class DataUtils {
     public String getUserStatus(String userId) {
         return (String) redisUtil.get(KylinRedisConst.ACTIVE_TICKET_AR_USER+ userId);
     }
+    //获得 ar券
+    public KylinTicketActive getArTicket(String code){
+       return (KylinTicketActive) redisUtil.get(KylinRedisConst.ACTIVE_TICKET_AR_TICKET+code);
+    }
+    //设置 tikcet
+    public void setArTicket(KylinTicketActive kylinTicketActive){
+        redisUtil.set(KylinRedisConst.ACTIVE_TICKET_AR_TICKET+kylinTicketActive.getCode(),kylinTicketActive);
+    }
+    //设置用户状态。
+    public void setUser(String userId,String value){
+        redisUtil.set(KylinRedisConst.ACTIVE_TICKET_AR_USER+userId,value);
+
+    }
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -35,4 +35,6 @@ kylin_order_refund_entities.supplementEnter=UPDATE kylin_order_ticket_entities S
 kylin_perform_sub.insert=INSERT INTO kylin_perform_sub (perform_sub_id,performance_id,user_id,user_name,user_mobile,source_type) VALUES (?,?,?,?,?,?)
 # ------------------------ 万青弥补订单 ----------------------------
 kylin_order_express_ex.insert = INSERT INTO kylin_order_express_ex (`order_id`,`express_contacts`,`express_address`,`province`,`city`,`county`,`express_phone`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
-kylin_order_express_ex.sendMail = UPDATE kylin_order_express_ex SET mail_no = ? , updated_at = ? where order_id = ?
\ No newline at end of file
+kylin_order_express_ex.sendMail = UPDATE kylin_order_express_ex SET mail_no = ? , updated_at = ? where order_id = ?
+# ------------------------ ar演出队列 ----------------------------
+kylin_ar_ticket.update =update kylin_ticket_active set state=?,redeem_uid= ?,redeem_at= ? where `code`= ?
\ No newline at end of file