From bf1df8b38fd4a4dbdc8d2010197bf455ffcf7f81 Mon Sep 17 00:00:00 2001
From: limqhz <540344226@qq.com>
Date: Thu, 28 Dec 2023 22:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AF=AE=E7=90=83=E5=85=A5=E5=9C=BA=E4=B8=8B?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sv/api/controller/VenueController.java    | 24 ++++++++++++++++---
 .../test/java/com/sv/wx/WxServiceTest.java    |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/com/sv/api/controller/VenueController.java b/api/src/main/java/com/sv/api/controller/VenueController.java
index 9dab40f..4565b05 100644
--- a/api/src/main/java/com/sv/api/controller/VenueController.java
+++ b/api/src/main/java/com/sv/api/controller/VenueController.java
@@ -1,6 +1,8 @@
 package com.sv.api.controller;
 
 import com.enums.EnterEnum;
+import com.enums.PayTypeEnum;
+import com.sv.api.context.PlatformContext;
 import com.sv.dto.BasketEnterResult;
 import com.sv.entity.Device;
 import com.sv.entity.Order;
@@ -10,8 +12,10 @@ import com.sv.service.api.VenueService;
 import com.sv.service.common.BarcodeService;
 import com.sv.service.common.DoorLockUtil;
 import com.sv.service.oms.DeviceService;
+import com.ydd.framework.core.annotation.AccessToken;
 import com.ydd.framework.core.common.Pagination;
 import com.ydd.framework.core.common.dto.ResponseDTO;
+import com.ydd.framework.core.common.utils.RequestUtils;
 import com.ydd.framework.core.controller.BaseApiController;
 import com.ydd.framework.core.exception.ServiceException;
 import com.ydd.oms.entity.enums.PayStatusEnum;
@@ -20,6 +24,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 
 /**
  * Controller - 场馆
@@ -111,10 +116,11 @@ public class VenueController extends BaseApiController {
      * @return
      */
     @RequestMapping(value = "/member/isPayed", method = RequestMethod.POST)
-    public ResponseDTO isPayed(@RequestParam("venueId") Integer venueId) {
-        Order orderSn = orderService.findOrderSn("230801205026443583", 535);
+    public ResponseDTO isPayed(@RequestParam("venueId") Integer venueId,String orderSn) {
+        Integer memberId = getMemberIdByAccessToken();
+        Order order = orderService.findOrderSn(orderSn, memberId);
         boolean isPayed = false;
-        if (orderSn != null && orderSn.getPayStatus() != null && PayStatusEnum.PAYED.getValue() == orderSn.getPayStatus()) {
+        if (orderSn != null && order.getPayStatus() != null && PayStatusEnum.PAYED.getValue() == order.getPayStatus()) {
             isPayed = true;
         }
         return ResponseDTO.ok().addAttribute("isPayed", isPayed);
@@ -199,4 +205,16 @@ public class VenueController extends BaseApiController {
         return ResponseDTO.ok().addAttribute("barcode", barcode);
     }
 
+    /**
+     * 余额充值
+     */
+    @RequestMapping(value = "/venue/basketball/pay", method = RequestMethod.POST)
+    @AccessToken
+    public ResponseDTO recharge(@RequestParam("rechargeId") Integer rechargeId){
+        Venue venue = new Venue();
+        // TODO
+        return ResponseDTO.ok().
+                addAttribute("pay",orderService.createEnterVenueOrder(venue,getLoginMemberId(), PayTypeEnum.WEI_XIN,new BigDecimal(10)));
+    }
+
 }
diff --git a/api/src/test/java/com/sv/wx/WxServiceTest.java b/api/src/test/java/com/sv/wx/WxServiceTest.java
index 443c55e..da5e2fd 100644
--- a/api/src/test/java/com/sv/wx/WxServiceTest.java
+++ b/api/src/test/java/com/sv/wx/WxServiceTest.java
@@ -32,7 +32,7 @@ public class WxServiceTest {
     public void refund(){
 //        wechatPayService.createUnifiedOrder("testlmq20231224",new BigDecimal(0.02),"127.0.0.1","JSAPI", 535);
         // 根据orderSn查出对应订单信息
-        String orderSn = "231224213047442679";
+        String orderSn = "231228000925924610";
         Integer memberId = 535;
         Order order = orderService.findOrderSn(orderSn,memberId);
         if (order == null){