From ade7baaa6b2d2098806cf3e2fdb38c7e4173f8ce Mon Sep 17 00:00:00 2001
From: limqhz <l>
Date: Thu, 23 Jul 2020 16:06:24 +0800
Subject: [PATCH] =?UTF-8?q?api-=E7=9B=AE=E5=89=8D=E5=8F=AA=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=81=A5=E8=BA=AB=E9=A6=86=E5=BC=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sv/netty/controller/QREnterController.java     |  9 +++++----
 .../com/sv/exception/api/ExceptionCodeTemplate.java    |  1 +
 .../main/java/com/sv/service/api/QRCodeService.java    | 10 +++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/com/sv/netty/controller/QREnterController.java b/api/src/main/java/com/sv/netty/controller/QREnterController.java
index 66e3eff..0a52423 100644
--- a/api/src/main/java/com/sv/netty/controller/QREnterController.java
+++ b/api/src/main/java/com/sv/netty/controller/QREnterController.java
@@ -1,13 +1,16 @@
 package com.sv.netty.controller;
 
 import com.enums.DeviceType;
+import com.enums.VenueTypeEnum;
 import com.sv.entity.Venue;
+import com.sv.entity.VenueType;
 import com.sv.netty.config.ClientChannelCache;
 import com.sv.netty.config.Constant;
 import com.sv.netty.netty.service.MessageService;
 import com.sv.service.api.QRCodeService;
 import com.ydd.framework.core.common.dto.ResponseDTO;
 import com.ydd.framework.core.controller.BaseApiController;
+import com.ydd.framework.core.exception.ServiceException;
 import io.netty.channel.Channel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,10 +63,8 @@ public class QREnterController extends BaseApiController {
         String deviceName = getDeviceName(deviceId);
         DeviceType enterOrOut = getEnterOrOut(deviceId);
         Venue venue = qrCodeService.initEnter(venueId, deviceName);
-        if (venue!=null){
-            Channel channel = ClientChannelCache.getCurrentChannel(deviceName,venueId ,enterOrOut);
-            messageService.sendLoading(channel,memberId);
-        }
+        Channel channel = ClientChannelCache.getCurrentChannel(deviceName,venueId ,enterOrOut);
+        messageService.sendLoading(channel,memberId);
         return ResponseDTO.ok().addAttribute("venueInit", venue);
     }
 
diff --git a/entity/src/main/java/com/sv/exception/api/ExceptionCodeTemplate.java b/entity/src/main/java/com/sv/exception/api/ExceptionCodeTemplate.java
index e2c9785..d0cd1d9 100644
--- a/entity/src/main/java/com/sv/exception/api/ExceptionCodeTemplate.java
+++ b/entity/src/main/java/com/sv/exception/api/ExceptionCodeTemplate.java
@@ -52,6 +52,7 @@ public class ExceptionCodeTemplate {
     public static final ExceptionCode VENUE_ERROR = ExceptionCode.init(30023, "场馆暂未开放");
 
     public static final ExceptionCode DEVICE_ERROR = ExceptionCode.init(30024, "未找到该设备");
+    public static final ExceptionCode VENUE_TYPE_ERROR = ExceptionCode.init(30025, "该场馆暂不支持扫码入场");
 
 
 
diff --git a/service/src/main/java/com/sv/service/api/QRCodeService.java b/service/src/main/java/com/sv/service/api/QRCodeService.java
index 979a42c..b5bc86d 100644
--- a/service/src/main/java/com/sv/service/api/QRCodeService.java
+++ b/service/src/main/java/com/sv/service/api/QRCodeService.java
@@ -1,6 +1,7 @@
 package com.sv.service.api;
 
 import com.enums.DeviceType;
+import com.enums.VenueTypeEnum;
 import com.sv.entity.Venue;
 import com.sv.mapper.DeviceMapper;
 import com.sv.mapper.VenueMapper;
@@ -30,7 +31,14 @@ public class QRCodeService {
         if (integer != 1){
             throw new ServiceException(com.sv.exception.api.ExceptionCodeTemplate.DEVICE_ERROR);
         }
-        return venueMapper.findById(venueId);
+        Venue venue = venueMapper.findById(venueId);
+        if (venue==null){
+            throw new ServiceException(com.sv.exception.api.ExceptionCodeTemplate.VENUE_ERROR);
+        }
+        if (!VenueTypeEnum.FITNESS.value.equals(venue.getType())){
+            throw new ServiceException(com.sv.exception.api.ExceptionCodeTemplate.VENUE_TYPE_ERROR);
+        }
+        return venue;
     }