From 23fe389507f24388c0ea82788719103a8dcd3f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 19 Aug 2025 19:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=96=E6=B6=88=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java     | 7 +++++++
 .../java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
index 3ba9f36..3b910e8 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
@@ -217,6 +217,13 @@ public class ShopOrder implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime expirationTime;
 
+    @Schema(description = "评价状态 0未评价 1已评价")
+    private Integer evaluateStatus;
+
+    @Schema(description = "评价时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime evaluateTime;
+
     @Schema(description = "对账情况：0=未对账；1=已对账；3=已对账，金额对不上；4=未查询到该订单")
     private Integer checkBill;
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml
index c69c966..f126855 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml
@@ -225,7 +225,7 @@
             <if test="param.statusFilter != null and param.statusFilter != -1">
               <if test="param.statusFilter == 0">
                 <!-- 0待支付：未付款 -->
-                AND a.pay_status = 0
+                AND a.pay_status = 0 AND a.order_status = 0
               </if>
               <if test="param.statusFilter == 1">
                 <!-- 1待发货：已付款但未发货 -->
@@ -241,7 +241,7 @@
               </if>
               <if test="param.statusFilter == 4">
                 <!-- 4待评价：订单已完成但可能需要评价 -->
-                AND a.order_status = 1
+                AND a.order_status = 1 AND a.evaluate_status = 0
               </if>
               <if test="param.statusFilter == 5">
                 <!-- 5已完成：订单状态为已完成 -->