From efb226b37bf743085131d68a267c07c77256ee4a Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 25 Jun 2021 14:32:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=AF=89=E5=B1=95=E7=A4=BA=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/order/service/OrderComplaintService.java  | 6 +++---
 .../order/order/serviceimpl/OrderComplaintServiceImpl.java  | 4 ++--
 .../statistics/serviceimpl/IndexStatisticsServiceImpl.java  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
index 4d742153..37eee01b 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
@@ -68,11 +68,11 @@ public interface OrderComplaintService extends IService<OrderComplaint> {
     OrderComplaint updateOrderComplainByStatus(OrderComplaintOperationParams operationParam);
 
     /**
-     * 获取新投诉数量
+     * 待处理投诉数量
      *
-     * @return 新投诉
+     * @return 待处理投诉数量
      */
-    Integer newComplainNum();
+    Integer waitComplainNum();
 
     /**
      * 取消交易投诉
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
index ae260d65..b0a198aa 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
@@ -198,9 +198,9 @@ public class OrderComplaintServiceImpl extends ServiceImpl<OrderComplaintMapper,
     }
 
     @Override
-    public Integer newComplainNum() {
+    public Integer waitComplainNum() {
         QueryWrapper queryWrapper = Wrappers.query();
-        queryWrapper.eq("complain_status", ComplaintStatusEnum.NEW.name());
+        queryWrapper.ne("complain_status", ComplaintStatusEnum.COMPLETE.name());
         queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
                 "store_id", UserContext.getCurrentUser().getStoreId());
         return this.count(queryWrapper);
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
index b191d75a..65a113a5 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
@@ -121,7 +121,7 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService {
         //售后申请
         indexNoticeVO.setRefund(afterSaleService.applyNum(null));
         //投诉审核
-        indexNoticeVO.setComplain(orderComplaintService.newComplainNum());
+        indexNoticeVO.setComplain(orderComplaintService.waitComplainNum());
         //分销员提现审核
         indexNoticeVO.setDistributionCash(distributionCashService.newDistributionCash());
         //待处理商家结算
@@ -218,8 +218,8 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService {
         storeIndexStatisticsVO.setReturnMoney(afterSaleService.applyNum(AfterSaleTypeEnum.RETURN_MONEY.name()));
         //待回复评价数量
         storeIndexStatisticsVO.setMemberEvaluation(memberEvaluationService.getWaitReplyNum());
-        //待处理交易投诉数量
-        storeIndexStatisticsVO.setComplaint(orderComplaintService.newComplainNum());
+        //待处理投诉数量
+        storeIndexStatisticsVO.setComplaint(orderComplaintService.waitComplainNum());
 
         //待上架商品数量
         storeIndexStatisticsVO.setWaitUpper(goodsService.goodsNum(GoodsStatusEnum.DOWN, null));