From 6736a5c861869a7fa896507552e4214cee0f0582 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Mon, 29 Jan 2024 22:42:41 +0800 Subject: [PATCH] =?UTF-8?q?fixbug=20=E5=B1=95=E7=A4=BA=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=9C=89=E8=AF=AF=20&=20=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=85=85=E5=80=BC=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/sv/api/controller/OrderController.java | 7 ++++--- .../main/java/com/ydd/oms/task/BarcodeTimeOrderTask.java | 2 +- .../main/java/com/sv/service/api/MemberRefundService.java | 2 +- .../main/java/com/sv/service/api/VenueEnterService.java | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/com/sv/api/controller/OrderController.java b/api/src/main/java/com/sv/api/controller/OrderController.java index e90e12e..565739c 100644 --- a/api/src/main/java/com/sv/api/controller/OrderController.java +++ b/api/src/main/java/com/sv/api/controller/OrderController.java @@ -8,6 +8,7 @@ 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 org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; @@ -24,7 +25,7 @@ import javax.annotation.Resource; public class OrderController extends BaseApiController { private final Logger logger = LoggerFactory.getLogger(OrderController.class); - + @Resource private OrderService orderService; @@ -71,7 +72,7 @@ public class OrderController extends BaseApiController { @RequestMapping(value = "/order/recharge", method = RequestMethod.POST) @AccessToken public ResponseDTO recharge(@RequestParam("rechargeId") Integer rechargeId){ - return ResponseDTO.ok(). - addAttribute("pay",orderService.createRecharge(getLoginMemberId(),PlatformContext.getValue(),rechargeId,RequestUtils.getIp())); + throw new ServiceException("请优先使用实时支付，暂不支持余额充值！"); +// return ResponseDTO.ok().addAttribute("pay",orderService.createRecharge(getLoginMemberId(),PlatformContext.getValue(),rechargeId,RequestUtils.getIp())); } } diff --git a/oms/src/main/java/com/ydd/oms/task/BarcodeTimeOrderTask.java b/oms/src/main/java/com/ydd/oms/task/BarcodeTimeOrderTask.java index 4719ff2..58dc1ed 100644 --- a/oms/src/main/java/com/ydd/oms/task/BarcodeTimeOrderTask.java +++ b/oms/src/main/java/com/ydd/oms/task/BarcodeTimeOrderTask.java @@ -82,7 +82,7 @@ public class BarcodeTimeOrderTask { logger.info("用户" + barcodeOrderTime.getMemberId() + "的订单" + barcodeOrderTime.getOrderSn() + "需要退款" + barcodeOrderTime.getPayMoney()); MemberRefund memberRefund = new MemberRefund(); memberRefund.setMemberId(barcodeOrderTime.getMemberId()); - memberRefund.setLessonId(1); + memberRefund.setLessonId(barcodeOrderTime.getId()); memberRefund.setMoney(order.getPrice()); memberRefund.setOrderSn(barcodeOrderTime.getOrderSn()); memberRefund.setTransactionId(order.getTradeSn()); 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 88cd23f..ea6b63d 100644 --- a/service/src/main/java/com/sv/service/api/MemberRefundService.java +++ b/service/src/main/java/com/sv/service/api/MemberRefundService.java @@ -1,7 +1,6 @@ package com.sv.service.api; import com.enums.MoneyLogEnum; -import com.enums.OrderPayEnum; import com.enums.PayTypeEnum; import com.github.pagehelper.PageHelper; import com.sv.dto.api.MemberLessonTicketDetailDTO; @@ -191,6 +190,7 @@ public class MemberRefundService extends BaseServiceImpl { if (barcodeOrderTime.getOrderSn() != null && barcodeOrderTime.getOrderSn().equals(memberRefund.getOrderSn())) { barcodeOrderTime.setSumPayMoney(barcodeOrderTime.getSumPayMoney() == null ? 0 : barcodeOrderTime.getSumPayMoney() + memberRefund.getMoney().intValue()); + barcodeOrderTime.setPayMoney(0); barcodeOrderTime.setModifiedTime(new Date()); barcodeOrderTimeMapper.updateByPrimaryKey(barcodeOrderTime); } diff --git a/service/src/main/java/com/sv/service/api/VenueEnterService.java b/service/src/main/java/com/sv/service/api/VenueEnterService.java index 456e9d4..011d7c2 100644 --- a/service/src/main/java/com/sv/service/api/VenueEnterService.java +++ b/service/src/main/java/com/sv/service/api/VenueEnterService.java @@ -182,7 +182,6 @@ public class VenueEnterService extends BaseServiceImpl { } else { // 不需要补交钱且需要退钱 lastOrder.setPayMoney(price.abs().intValue()); - lastOrder.setSumPayMoney(price.abs().intValue()); if (lastOrder.getPayMoney() > 0) { lastOrder.setPaying(1); lastOrder.setModifiedTime(new Date());