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

检验二维码是否使用，增加二维码失效功能 & fixbug 未超过半小时只收一半钱

Browse Source
This commit is contained in:
limqhz
2024-01-16 00:27:19 +08:00
parent a0aab56499
commit 017384b778
14 changed files with 290 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
oms/src/main/java/com/sv/oms/controller/MemberEnterVeneuLogController.java
View File

@@ -1,5 +1,6 @@
package com.sv.oms.controller;
import com.sv.entity.MemberEnterVenueLog;
import com.sv.service.api.VenueEnterService;
import com.sv.service.oms.MemberEnterVenueLogService;
import com.ydd.framework.core.common.Pagination;
import com.ydd.framework.core.common.dto.ResponseDTO;
@@ -10,6 +11,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
/**
* Controller - 篮球进场订单
@@ -21,33 +23,32 @@ import javax.annotation.Resource;
public class MemberEnterVeneuLogController extends OmsController {
private final Logger logger = LoggerFactory.getLogger(MemberEnterVeneuLogController.class);
@Resource
private MemberEnterVenueLogService memberEnterVeneuLogService;
@Resource
private VenueEnterService venueEnterService;
/**
* 分页查询篮球进场订单
*/
@RequestMapping(value = "/member/enter/veneu/logs", method = RequestMethod.GET)
public ResponseDTO findPage(Pagination pagination,
@RequestParam(value = "payStatus",required = false) Integer payStatus,
@RequestParam(value = "memberId",required = false) Integer memberId,
@RequestParam(value = "starTime",required = false) String starTime,
@RequestParam(value = "endTime",required = false) String endTime,
@RequestParam(value = "orderSn",required = false) String orderSn,
@RequestParam(value = "payType",required = false) Integer payType,
@RequestParam(value = "venueId",required = false)Integer venueId) {
@RequestParam(value = "state",required = false) Integer state) {
return ResponseDTO.ok()
.setPagination(memberEnterVeneuLogService.findPage(pagination, payStatus, memberId, starTime, endTime, orderSn, payType,venueId));
.setPagination(memberEnterVeneuLogService.findPage(pagination, starTime, endTime, orderSn, state));
}
/**
* 查询篮球进场订单信息
*/
@RequestMapping(value = "/member/enter/veneu/log/{id}", method = RequestMethod.GET)
public ResponseDTO findById(@PathVariable("id") Integer id) {
@RequestMapping(value = "/member/find/order/enter/log", method = RequestMethod.GET)
public ResponseDTO findByPageId(Pagination pagination,@RequestParam("id") String id) {
return ResponseDTO.ok()
.addAttribute("memberEnterVeneuLog", memberEnterVeneuLogService.findById(id));
.setPagination(memberEnterVeneuLogService.findByOrderNo(pagination,id));
}
/**
@@ -68,4 +69,10 @@ public class MemberEnterVeneuLogController extends OmsController {
return ResponseDTO.ok("删除成功");
}
@RequestMapping(value = "/member/enter/veneu/account", method = RequestMethod.POST)
public ResponseDTO enterOrderAccount(@RequestParam("EnterId") Integer enterId,@RequestParam("payMoney") Integer payMoney) {
venueEnterService.enterOrderAccount(enterId,payMoney);
return ResponseDTO.ok("结算成功");
}
}