From c4e3268efad0e269552f3dd8857f0706748036e5 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Wed, 27 Dec 2023 09:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E7=9A=84?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=80=BB=E8=BE=91=20member/isPayed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sv/api/controller/VenueController.java | 22 +++++++++++++++++-- .../ydd/oms/entity/enums/PayStatusEnum.java | 6 ++--- .../sv/service/api/MemberRefundService.java | 1 - .../java/com/sv/service/api/OrderService.java | 9 +------- .../service/api/config/WechatPayService.java | 2 +- 5 files changed, 25 insertions(+), 15 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 177b6a6..4fa0b1b 100644 --- a/api/src/main/java/com/sv/api/controller/VenueController.java +++ b/api/src/main/java/com/sv/api/controller/VenueController.java @@ -3,8 +3,10 @@ package com.sv.api.controller; import com.enums.EnterEnum; import com.sv.dto.BarCodeResult; import com.sv.entity.Device; +import com.sv.entity.Order; import com.sv.entity.Venue; import com.sv.mapper.BarcodeMapper; +import com.sv.service.api.OrderService; import com.sv.service.api.VenueService; import com.sv.service.common.BarcodeService; import com.sv.service.common.DoorLockUtil; @@ -13,6 +15,7 @@ import com.ydd.framework.core.common.Pagination; import com.ydd.framework.core.common.dto.ResponseDTO; import com.ydd.framework.core.controller.BaseApiController; import com.ydd.framework.core.exception.ServiceException; +import com.ydd.oms.entity.enums.PayStatusEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; @@ -100,9 +103,24 @@ public class VenueController extends BaseApiController { } @Resource - DeviceService deviceService; + OrderService orderService; + /** + * 判断是否支付成功 + * @param venueId 场馆Id + * @return + */ + @RequestMapping(value = "/member/isPayed", method = RequestMethod.POST) + public ResponseDTO isPayed(@RequestParam("venueId") Integer venueId) { + Order orderSn = orderService.findOrderSn("230801205026443583", 535); + boolean isPayed = false; + if (orderSn != null && orderSn.getPayStatus() != null && PayStatusEnum.PAYED.getValue() == orderSn.getPayStatus()) { + isPayed = true; + } + return ResponseDTO.ok().addAttribute("isPayed", isPayed); + } + @Resource - BarcodeMapper barcodeMapper; + DeviceService deviceService; /** * 我要进场 * diff --git a/entity/src/main/java/com/ydd/oms/entity/enums/PayStatusEnum.java b/entity/src/main/java/com/ydd/oms/entity/enums/PayStatusEnum.java index 6966c53..6a141d1 100644 --- a/entity/src/main/java/com/ydd/oms/entity/enums/PayStatusEnum.java +++ b/entity/src/main/java/com/ydd/oms/entity/enums/PayStatusEnum.java @@ -10,15 +10,15 @@ public enum PayStatusEnum { NOT_PAY(0, "未支付"), PAYED(1, "已支付"); - public Byte value; + public Integer value; public String name; PayStatusEnum(Integer value, String name) { - this.value = value.byteValue(); + this.value = value; this.name = name; } - public Byte getValue() { + public Integer getValue() { return value; } diff --git a/service/src/main/java/com/sv/service/api/MemberRefundService.java b/service/src/main/java/com/sv/service/api/MemberRefundService.java index f927303..6e58155 100644 --- a/service/src/main/java/com/sv/service/api/MemberRefundService.java +++ b/service/src/main/java/com/sv/service/api/MemberRefundService.java @@ -13,7 +13,6 @@ import com.sv.service.api.config.WechatPayService; import com.ydd.framework.core.common.Pagination; import com.ydd.framework.core.exception.ServiceException; import com.ydd.framework.core.service.impl.BaseServiceImpl; -import com.ydd.oms.entity.enums.PayStatusEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/service/src/main/java/com/sv/service/api/OrderService.java b/service/src/main/java/com/sv/service/api/OrderService.java index 3758249..b3cd1f3 100644 --- a/service/src/main/java/com/sv/service/api/OrderService.java +++ b/service/src/main/java/com/sv/service/api/OrderService.java @@ -168,13 +168,6 @@ public class OrderService extends BaseServiceImpl { orderMapper.updatePrepayId(orderSn,prepayId); } - /** - * api - */ - public Order findByOrderSn(String orderSn, Integer memberId) { - return orderMapper.findOrderSn(orderSn, memberId); - } - /** * api 支付成功 * @@ -259,7 +252,7 @@ public class OrderService extends BaseServiceImpl { order.setPayType(payTypeEnum.value); order.setPrice(price); order.setPayTime(new Date()); - order.setPayStatus(PayStatusEnum.PAYED.value.intValue()); + order.setPayStatus(PayStatusEnum.PAYED.value); order.setType(OrderTypeEnum.BASKETBALL_ORDER.value); order.setPlatformId(venue.getPlatformId()); order.setMemberId(memberId); diff --git a/service/src/main/java/com/sv/service/api/config/WechatPayService.java b/service/src/main/java/com/sv/service/api/config/WechatPayService.java index d22e6ee..cec99d8 100644 --- a/service/src/main/java/com/sv/service/api/config/WechatPayService.java +++ b/service/src/main/java/com/sv/service/api/config/WechatPayService.java @@ -143,7 +143,7 @@ public class WechatPayService extends BaseServiceImpl { if (params.get("return_code").equals("SUCCESS")) { if (params.get("result_code").equals("SUCCESS")) { String orderSn = params.get("out_trade_no"); - Order order = orderService.findByOrderSn(orderSn,null); + Order order = orderService.findOrderSn(orderSn,null); if (order.getPayStatus().intValue() > 0) { //已支付 不需要在判断 return;