venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

篮球入场下订单初始化

Browse Source
This commit is contained in:
limqhz
2023-12-28 22:10:25 +08:00
parent 78057753fc
commit bf1df8b38f
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
api/src/main/java/com/sv/api/controller/VenueController.java
View File

@@ -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)));
}
}

2
api/src/test/java/com/sv/wx/WxServiceTest.java
View File

@@ -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){