From d9de601e8a5c985ad90f496c301f6206cba281ec Mon Sep 17 00:00:00 2001
From: Chopper711 <liushuai711@gmail.com>
Date: Wed, 11 Jan 2023 11:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=95=B0=E9=87=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=A2=B3=E7=90=86=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/AfterSaleServiceImpl.java     |  7 +++--
 .../modules/payment/kit/RefundSupport.java    | 28 -------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
index 22d9b33d..c6724bc4 100644
--- a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
@@ -455,7 +455,10 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         switch (afterSaleStatusEnum) {
             //判断当前售后的状态---申请中
             case APPLY: {
+//                买家申请售后时已经输入了订单售后数量，这里不需要(+x)处理
                 orderItem.setReturnGoodsNumber(orderItem.getReturnGoodsNumber() + afterSale.getNum());
+                //修改orderItem订单
+                this.updateOrderItem(orderItem);
                 break;
             }
 
@@ -464,13 +467,13 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
             case BUYER_CANCEL:
             case SELLER_TERMINATION: {
                 orderItem.setReturnGoodsNumber(orderItem.getReturnGoodsNumber() - afterSale.getNum());
+                //修改orderItem订单
+                this.updateOrderItem(orderItem);
                 break;
             }
             default:
                 break;
         }
-        //修改orderItem订单
-        this.updateOrderItem(orderItem);
     }
 
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
index 3e3d059e..5f8d9dd7 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
@@ -4,8 +4,6 @@ import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.SpringContextUtil;
 import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;
-import cn.lili.modules.order.order.entity.dos.OrderItem;
-import cn.lili.modules.order.order.service.OrderItemService;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.order.order.service.StoreFlowService;
 import cn.lili.modules.payment.entity.RefundLog;
@@ -35,11 +33,6 @@ public class RefundSupport {
      */
     @Autowired
     private OrderService orderService;
-    /**
-     * 子订单
-     */
-    @Autowired
-    private OrderItemService orderItemService;
 
     /**
      * 售后退款
@@ -64,31 +57,10 @@ public class RefundSupport {
         Payment payment = (Payment) SpringContextUtil.getBean(paymentMethodEnum.getPlugin());
         payment.refund(refundLog);
 
-        this.updateReturnGoodsNumber(afterSale);
-
         //记录退款流水
         storeFlowService.refundOrder(afterSale);
     }
 
-    /**
-     * 功能描述: 修改子订单中已售后退款商品数量
-     *
-     * @return void
-     * @Author ftyy
-     * @Date 17:33 2021/11/18
-     * @Param [afterSale]
-     **/
-    private void updateReturnGoodsNumber(AfterSale afterSale) {
-        //根据商品id及订单sn获取子订单
-        OrderItem orderItem = orderItemService.getByOrderSnAndSkuId(afterSale.getOrderSn(), afterSale.getSkuId());
-
-        orderItem.setReturnGoodsNumber(afterSale.getNum() + orderItem.getReturnGoodsNumber());
-
-        //修改子订单订单中的退货数量
-        orderItemService.updateById(orderItem);
-    }
-
-
     /**
      * 退款通知
      *