自动取消订单任务

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;
 

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已完成：订单状态为已完成 -->