From 15643b219ddf09703ff344289a0142afef0fac6d Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 05 七月 2024 15:31:48 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index e5123ad..a4d7764 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -872,25 +872,24 @@
@Override
public void delOrderOne(MemberOrderListDTO memberOrderListDTO) {
- baseMapper.deleteById(memberOrderListDTO.getId());
- Order order = baseMapper.selectById(memberOrderListDTO.getId());
+
Order byId = this.getById(memberOrderListDTO.getId());
goodsSkuClient.GroupPurchaseNum1(byId.getGoodsSkuId(), SecurityConstants.INNER);
this.removeById(memberOrderListDTO.getId());
- if (order.getOrderStatus().getCode() == 2) {
+ if (byId.getOrderStatus().getCode() == 2) {
updMembeOneDTO MembeOneDTO = new updMembeOneDTO();
MembeOneDTO.setType(2);
- MembeOneDTO.setMemberId(order.getMemberId());
- MembeOneDTO.setMoney(order.getTotalAmount());
- MembeOneDTO.setTotalPoints(order.getPoints());
+ MembeOneDTO.setMemberId(byId.getMemberId());
+ MembeOneDTO.setMoney(byId.getTotalAmount());
+ MembeOneDTO.setTotalPoints(byId.getPoints());
memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);
- if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//支付宝
+ if (byId.getPaymentMethod() != null && byId.getPaymentMethod().getCode() == 2) {//支付宝
//获取支付信息
LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
- paylogEntityWrapper.eq(Paylog::getOutTradeNo, order.getOrderNo());
+ paylogEntityWrapper.eq(Paylog::getOutTradeNo, byId.getOrderNo());
Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
if (paylog != null) {
boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
@@ -899,10 +898,10 @@
}
}
- } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//微信
+ } else if (byId.getPaymentMethod() != null && byId.getPaymentMethod().getCode() == 1) {//微信
//获取支付信息
LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
- paylogEntityWrapper.eq(Paylog::getOutTradeNo, order.getOrderNo());
+ paylogEntityWrapper.eq(Paylog::getOutTradeNo, byId.getOrderNo());
Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
if (paylog != null) {
String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
@@ -913,7 +912,7 @@
String regEx = "[^0-9]";
Pattern p = Pattern.compile(regEx);
- Matcher m = p.matcher(order.getOrderNo());
+ Matcher m = p.matcher(byId.getOrderNo());
String ma = m.replaceAll("").trim();
boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
if (!bo) {
@@ -923,6 +922,7 @@
}
}
}
+ baseMapper.deleteById(memberOrderListDTO.getId());
}
@Override
--
Gitblit v1.7.1