From de0026f420814a34a0e94c2de702b563b7e9234e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 31 七月 2024 16:10:12 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
index 8ef985d..2a531cb 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
@@ -36,6 +36,7 @@
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
import com.ruoyi.system.api.domain.vo.Express100VO;
import com.ruoyi.system.api.domain.vo.OrderReturnVO;
+import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.PromotionClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
@@ -79,7 +80,8 @@
@Resource
private PromotionClient promotionClient;
-
+ @Resource
+ private GoodsSkuClient goodsSkuClient;
@Override
public OrderReturnVO saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
Order order = orderMapper.selectById(OrderReturnDTO.getOrderId());
@@ -179,7 +181,7 @@
order.setOrderStatus(OrderStatusEnum.FINISHED);
order.setIsRequest(1);
orderMapper.updateById(order);
- this.removeById(byId);
+ this.updateById(byId);
}
@Override
@@ -188,6 +190,7 @@
byId.setStatus(ReturnRequestStatusEnum.TO_BE_RECEIVED_BY_THE_PLATFORM);
byId.setLogisticsNum(OrderReturnDTO.getLogistics());
byId.setCourierNumber(OrderReturnDTO.getCourierNumber());
+ byId.setReturnTime(LocalDateTime.now());
this.updateById(byId);
}
@@ -300,6 +303,12 @@
}
}
}
+ if (Objects.nonNull(order.getCouponId())) {
+ CouponMemberDTO couponMemberDTO = new CouponMemberDTO();
+ couponMemberDTO.setId(order.getCouponId());
+ couponMemberDTO.setCouponStatus(CouponUseEnum.UNUSED.getCode());
+ promotionClient.updCouponMember(couponMemberDTO, SecurityConstants.INNER);
+ }
}
orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
// 扣除订单积分
@@ -319,12 +328,6 @@
updMembeOneDTO.setTotalPoints(
Math.max(member.getTotalPoints() - order.getPoints(), 0));
memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
- }
- if (Objects.nonNull(order.getCouponId())) {
- CouponMemberDTO couponMemberDTO = new CouponMemberDTO();
- couponMemberDTO.setId(order.getCouponId());
- couponMemberDTO.setCouponStatus(CouponUseEnum.UNUSED.getCode());
- promotionClient.updCouponMember(couponMemberDTO, SecurityConstants.INNER);
}
} else {
orderReturnRequest.setStatus(ReturnRequestStatusEnum.REJECTED);
@@ -400,6 +403,9 @@
dto.setCouponStatus(CouponUseEnum.UNUSED.getCode());
promotionClient.updCouponMember(dto, SecurityConstants.INNER);
}
+ // 退回剩余库存
+ goodsSkuClient.returnStockByOrder(order, SecurityConstants.INNER);
+
}
private boolean handleRefund(PaymentMethodEnum paymentMethod, Paylog paylog, String orderNo) {
--
Gitblit v1.7.1