From 7e56c801713ff243384459ea1c0c98d548d34db3 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 30 Jul 2025 14:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/storeorder/StoreOrderMapper.java    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/dal/mysql/storeorder/StoreOrderMapper.java b/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/dal/mysql/storeorder/StoreOrderMapper.java
index 1899ee1..adc5320 100644
--- a/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/dal/mysql/storeorder/StoreOrderMapper.java
+++ b/yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/dal/mysql/storeorder/StoreOrderMapper.java
@@ -43,7 +43,7 @@ public interface StoreOrderMapper extends BaseMapperX<StoreOrderDO> {
                 .betweenIfPresent(StoreOrderDO::getCreateTime, reqVO.getCreateTime());
                 //.orderByDesc(StoreOrderDO::getId);
         if( OrderTypeEnum.TYPE_WORK.getValue().equals(reqVO.getType())){
-            wrapper.orderByAsc(StoreOrderDO::getCreateTime);
+            wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue()).orderByAsc(StoreOrderDO::getCreateTime);
         }else{
             wrapper.orderByDesc(StoreOrderDO::getCreateTime);
         }
@@ -51,13 +51,15 @@ public interface StoreOrderMapper extends BaseMapperX<StoreOrderDO> {
             switch (AdminOrderStatusEnum.toType(reqVO.getOrderStatus())) {
                 //未支付
                 case STATUS_0:
-                    wrapper.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_0.getValue())
+                    wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
+                            .eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_0.getValue())
                             .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
                             .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_0.getValue());
                     break;
                 //待发货
                 case STATUS_1:
-                    wrapper.eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
+                    wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
+                            .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
                             .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_0.getValue());
                     if( OrderTypeEnum.TYPE_WORK.getValue().equals(reqVO.getType())){
                         wrapper.and(i->i.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
@@ -69,26 +71,30 @@ public interface StoreOrderMapper extends BaseMapperX<StoreOrderDO> {
                     break;
                 //待收货
                 case STATUS_2:
-                    wrapper.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
+                    wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
+                            .eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
                             .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
                             .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_1.getValue());
                     break;
                 //待评价
                 case STATUS_3:
-                    wrapper.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
+                    wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
+                            .eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
                             .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
                             .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_2.getValue());
                     break;
                 //已完成
                 case STATUS_4:
-                    wrapper.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
+                    wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
+                            .eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
                             .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
                             .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_3.getValue());
                     break;
                 //退款单
                 case STATUS_5:
                     String[] strs = {"1", "2"};
-                    wrapper.in(StoreOrderDO::getRefundStatus, strs);
+                    wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
+                            .in(StoreOrderDO::getRefundStatus, strs);
                     break;
                 //已删除
                 case STATUS_6: