fix - 篮球入场出场逻辑优化、丢弃二维码的逻辑、优化入场出场锁逻辑。

api/src/main/java/com/sv/api/controller/VenueController.java

@@ -117,7 +117,6 @@ public class VenueController extends BaseApiController {
      * @param orderSn 订单号
      * @return
      */
-    @Deprecated
     @RequestMapping(value = "/member/isPayed", method = RequestMethod.POST)
     public ResponseDTO isPayed(@RequestParam("orderSn") String orderSn) {
         Integer memberId = getMemberIdByAccessToken();
@@ -153,7 +152,7 @@ public class VenueController extends BaseApiController {
             logger.warn("[入场] memberId={}, venueId={}, 门锁被占用 doorSn={}", memberId, venueId, doorSn);
             throw new ServiceException("有人正在使用门禁，请稍后再试");
         }
-        join = venueEnterService.join(memberId, venueId);
+        join = venueEnterService.join(memberId, venueId,doorSn);
         logger.info("[入场] 结果 memberId={}, venueId={}, flg={}, msg={}, orderSn={}",
                 memberId, venueId, join.getFlg(), join.getMsg(), join.getOrderSn());
         return ResponseDTO.ok().addAttribute("join", join);
@@ -183,7 +182,7 @@ public class VenueController extends BaseApiController {
             logger.warn("[出场] memberId={}, venueId={}, 门锁被占用 doorSn={}", memberId, venueId, doorSn);
             throw new ServiceException("有人正在使用门禁，请稍后再试");
         }
-        out = venueEnterService.out(memberId, venueId);
+        out = venueEnterService.out(memberId, venueId,doorSn);
         logger.info("[出场] 结果 memberId={}, venueId={}, flg={}, msg={}, orderSn={}",
                 memberId, venueId, out.getFlg(), out.getMsg(), out.getOrderSn());
         return ResponseDTO.ok().addAttribute("out", out);
@@ -198,7 +197,7 @@ public class VenueController extends BaseApiController {
     @RequestMapping(value = "/venue/generate/barcode", method = RequestMethod.POST)
     public ResponseDTO generateBarcode(@RequestParam("orderSn") String orderSn,@RequestParam("venueId") Integer venueId,@RequestParam("enterFlag")Integer enterFlag) {
         Integer memberId = getMemberIdByAccessToken();
-        logger.info("[生成二维码] memberId={}, venueId={}, orderSn={}, enterFlag={}", memberId, venueId, orderSn, enterFlag);
+        logger.info("[真正进场] memberId={}, venueId={}, orderSn={}, enterFlag={}", memberId, venueId, orderSn, enterFlag);
         Device byDevice = deviceService.findByDevice(venueId);
         if (byDevice == null) {
             throw new ServiceException("门禁通讯异常");

api/src/test/java/com/sv/wx/VenueJoinTest.java

@@ -1,9 +1,12 @@
 package com.sv.wx;
 
 import com.WeiXinApplication;
+import com.sv.entity.Order;
 import com.sv.netty.netty.service.MessageService;
+import com.sv.service.api.OrderService;
 import com.sv.service.api.VenueEnterService;
 import com.sv.service.common.DoorLockUtil;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -17,10 +20,18 @@ public class VenueJoinTest {
     @Resource
     VenueEnterService venueEnterService;
     @Resource
-    MessageService messageService;
-    @Resource
-    DoorLockUtil doorLockUtil;
+    OrderService orderService;
 
+    /**
+     * 给订单支付成功！
+     */
+    @Test
+    public void test() {
+        String orderSn = "260613225858443661";
+        Order order = orderService.findOrderSn(orderSn,null);
+        orderService.paySuccess(order.getId(),"testggg");
+        venueEnterService.paySuccess(order);
+    }
 
 
 }