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-29 22:42:41 +08:00
parent cf506c3b36
commit 6736a5c861
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/main/java/com/sv/api/controller/OrderController.java
View File

@@ -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.dto.ResponseDTO;
import com.ydd.framework.core.common.utils.RequestUtils; import com.ydd.framework.core.common.utils.RequestUtils;
import com.ydd.framework.core.controller.BaseApiController; import com.ydd.framework.core.controller.BaseApiController;
import com.ydd.framework.core.exception.ServiceException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -24,7 +25,7 @@ import javax.annotation.Resource;
public class OrderController extends BaseApiController { public class OrderController extends BaseApiController {
private final Logger logger = LoggerFactory.getLogger(OrderController.class); private final Logger logger = LoggerFactory.getLogger(OrderController.class);
@Resource @Resource
private OrderService orderService; private OrderService orderService;
@@ -71,7 +72,7 @@ public class OrderController extends BaseApiController {
@RequestMapping(value = "/order/recharge", method = RequestMethod.POST) @RequestMapping(value = "/order/recharge", method = RequestMethod.POST)
@AccessToken @AccessToken
public ResponseDTO recharge(@RequestParam("rechargeId") Integer rechargeId){ public ResponseDTO recharge(@RequestParam("rechargeId") Integer rechargeId){
return ResponseDTO.ok(). throw new ServiceException("请优先使用实时支付，暂不支持余额充值！");
addAttribute("pay",orderService.createRecharge(getLoginMemberId(),PlatformContext.getValue(),rechargeId,RequestUtils.getIp())); // return ResponseDTO.ok().addAttribute("pay",orderService.createRecharge(getLoginMemberId(),PlatformContext.getValue(),rechargeId,RequestUtils.getIp()));
} }
} }

2
oms/src/main/java/com/ydd/oms/task/BarcodeTimeOrderTask.java
View File

@@ -82,7 +82,7 @@ public class BarcodeTimeOrderTask {
logger.info("用户" + barcodeOrderTime.getMemberId() + "的订单" + barcodeOrderTime.getOrderSn() + "需要退款" + barcodeOrderTime.getPayMoney()); logger.info("用户" + barcodeOrderTime.getMemberId() + "的订单" + barcodeOrderTime.getOrderSn() + "需要退款" + barcodeOrderTime.getPayMoney());
MemberRefund memberRefund = new MemberRefund(); MemberRefund memberRefund = new MemberRefund();
memberRefund.setMemberId(barcodeOrderTime.getMemberId()); memberRefund.setMemberId(barcodeOrderTime.getMemberId());
memberRefund.setLessonId(1); memberRefund.setLessonId(barcodeOrderTime.getId());
memberRefund.setMoney(order.getPrice()); memberRefund.setMoney(order.getPrice());
memberRefund.setOrderSn(barcodeOrderTime.getOrderSn()); memberRefund.setOrderSn(barcodeOrderTime.getOrderSn());
memberRefund.setTransactionId(order.getTradeSn()); memberRefund.setTransactionId(order.getTradeSn());

2
service/src/main/java/com/sv/service/api/MemberRefundService.java
View File

@@ -1,7 +1,6 @@
package com.sv.service.api; package com.sv.service.api;
import com.enums.MoneyLogEnum; import com.enums.MoneyLogEnum;
import com.enums.OrderPayEnum;
import com.enums.PayTypeEnum; import com.enums.PayTypeEnum;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.sv.dto.api.MemberLessonTicketDetailDTO; import com.sv.dto.api.MemberLessonTicketDetailDTO;
@@ -191,6 +190,7 @@ public class MemberRefundService extends BaseServiceImpl {
if (barcodeOrderTime.getOrderSn() != null if (barcodeOrderTime.getOrderSn() != null
&& barcodeOrderTime.getOrderSn().equals(memberRefund.getOrderSn())) { && barcodeOrderTime.getOrderSn().equals(memberRefund.getOrderSn())) {
barcodeOrderTime.setSumPayMoney(barcodeOrderTime.getSumPayMoney() == null ? 0 : barcodeOrderTime.getSumPayMoney() + memberRefund.getMoney().intValue()); barcodeOrderTime.setSumPayMoney(barcodeOrderTime.getSumPayMoney() == null ? 0 : barcodeOrderTime.getSumPayMoney() + memberRefund.getMoney().intValue());
barcodeOrderTime.setPayMoney(0);
barcodeOrderTime.setModifiedTime(new Date()); barcodeOrderTime.setModifiedTime(new Date());
barcodeOrderTimeMapper.updateByPrimaryKey(barcodeOrderTime); barcodeOrderTimeMapper.updateByPrimaryKey(barcodeOrderTime);
} }

1
service/src/main/java/com/sv/service/api/VenueEnterService.java
View File

@@ -182,7 +182,6 @@ public class VenueEnterService extends BaseServiceImpl {
} else { } else {
// 不需要补交钱且需要退钱 // 不需要补交钱且需要退钱
lastOrder.setPayMoney(price.abs().intValue()); lastOrder.setPayMoney(price.abs().intValue());
lastOrder.setSumPayMoney(price.abs().intValue());
if (lastOrder.getPayMoney() > 0) { if (lastOrder.getPayMoney() > 0) {
lastOrder.setPaying(1); lastOrder.setPaying(1);
lastOrder.setModifiedTime(new Date()); lastOrder.setModifiedTime(new Date());