From 840a2eabdbf27d044baf1224f3ad0bcfb789cee1 Mon Sep 17 00:00:00 2001
From: fengtianyangyang <tianyangyang.feng@javashop.cn>
Date: Fri, 19 Nov 2021 11:24:50 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=B9=B0=E5=AE=B6=E7=AB=AF=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8F=8A=E7=AE=A1=E7=90=86=E7=AB=AF=E7=BB=88?=
 =?UTF-8?q?=E6=AD=A2=E5=94=AE=E5=90=8E,=E4=B9=B0=E5=AE=B6=E7=AB=AF?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E5=94=AE=E5=90=8E=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/AfterSaleServiceImpl.java     | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
index 3df6954f..187f6b88 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
@@ -228,7 +228,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         //根据售后编号修改售后单
         this.updateAfterSale(afterSaleSn, afterSale);
         //获取商品已完成售后或正在进行的售后订单。修改订单售后状态
-        this.getAfterSaleList(afterSale);
+        this.updateOrderItemAfterSaleStatus(afterSale);
         //发送售后消息
         this.sendAfterSaleMessage(afterSale);
 
@@ -309,7 +309,8 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
 
         //根据售后编号修改售后单
         this.updateAfterSale(afterSaleSn, afterSale);
-
+        //修改子订单中正在售后的商品数量及状态
+        this.updateOrderItemAfterSaleStatus(afterSale);
         //发送售后消息
         this.sendAfterSaleMessage(afterSale);
         return afterSale;
@@ -358,6 +359,8 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
 
             //根据售后编号修改售后单
             this.updateAfterSale(afterSaleSn, afterSale);
+            //修改子订单正在售后商品数量及状态
+            this.updateOrderItemAfterSaleStatus(afterSale);
             return afterSale;
         }
         throw new ServiceException(ResultCode.AFTER_SALES_CANCEL_ERROR);
@@ -454,7 +457,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         this.sendAfterSaleMessage(afterSale);
 
         //根据售后订单修改订单的售后状态
-        this.getAfterSaleList(afterSale);
+        this.updateOrderItemAfterSaleStatus(afterSale);
 
         return afterSale;
     }
@@ -465,7 +468,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
      * @author ftyy
      * @Param afterSale
      **/
-    private void getAfterSaleList(AfterSale afterSale) {
+    private void updateOrderItemAfterSaleStatus(AfterSale afterSale) {
 
         //根据商品id及订单sn获取子订单
         OrderItem orderItem = orderItemService.getOne(new LambdaQueryWrapper<OrderItem>()
@@ -480,6 +483,15 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         if(afterSale.getServiceStatus().equals(AfterSaleStatusEnum.REFUSE.name())){
             orderItem.setIsGoodsNumber(orderItem.getIsGoodsNumber()-afterSale.getNum());
         }
+        //判断当前售后的状态---买家取消售后
+        if(afterSale.getServiceStatus().equals(AfterSaleStatusEnum.BUYER_CANCEL.name())){
+            orderItem.setIsGoodsNumber(orderItem.getIsGoodsNumber()-afterSale.getNum());
+        }
+        //判断当前售后的状态---卖家终止售后
+        if(afterSale.getServiceStatus().equals(AfterSaleStatusEnum.SELLER_TERMINATION.name())){
+            orderItem.setIsGoodsNumber(orderItem.getIsGoodsNumber()-afterSale.getNum());
+        }
+
         //正在售后商品总数等于商品总数,修改订单售后状态为已申请
         if (orderItem.getIsGoodsNumber().equals(orderItem.getNum())) {
             //修改订单的售后状态--已申请
@@ -588,10 +600,6 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         this.update(afterSale, queryWrapper);
     }
 
-    private void updateOrderItemAfterSaleStatus() {
-
-    }
-
     /**
      * 发送售后消息
      *