From c3ee24aeccf7358c4b4157e635cd255c1273eeb7 Mon Sep 17 00:00:00 2001
From: pengren <pengren0401@ztmarter.com>
Date: Mon, 15 Apr 2024 13:50:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-163=20?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sf/order/domain/req/OrderListReqVo.java | 6 +++++-
 .../main/java/com/sf/order/domain/res/OrderListResVo.java | 2 +-
 .../src/main/resources/mapper/order/OrderInfoMapper.xml   | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
index 98b755a..c0e0d17 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
@@ -1,9 +1,13 @@
 package com.sf.order.domain.req;
 
+import com.sf.common.core.domain.BaseEntity;
 import lombok.Data;
 
 @Data
-public class OrderListReqVo {
+public class OrderListReqVo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
     /**
      * 主键id
      */
diff --git a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
index 7d13bd1..1c7a63d 100644
--- a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
@@ -46,7 +46,7 @@ public class OrderListResVo {
     /**
      * 商品规格
      */
-    private Integer goodsSpec;
+    private String goodsSpec;
     /**
      * 商品数量
      */
diff --git a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
index e2a305d..207b139 100644
--- a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -44,7 +44,7 @@
     <sql id="selectOrderInfoVo">
         select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
     </sql>
-    <sql id="OrderListResVo">
+    <sql id="OrderListInfoVo">
         SELECT a.order_no,a.order_status,a.order_amt,b.product_title,b.product_picture,b.product_desc,b.goods_spec
         FROM ORDER_INFO a LEFT JOIN GOODS_MESSAGES b ON a.goods_id = b.id
     </sql>
@@ -77,10 +77,10 @@
     </select>
 
     <select id="queryList" parameterType="OrderListReqVo" resultMap="OrderListResVo">
-        <include refid="OrderListResVo"/>
+        <include refid="OrderListInfoVo"/>
         <where>
-            <if test="orderStatus != null "> and order_status = #{orderStatus}</if>
-            <if test="userId != null "> and create_user_id = #{userId}</if>
+            <if test="orderStatus != null "> and a.order_status = #{orderStatus}</if>
+            <if test="userId != null "> and a.create_user_id = #{userId}</if>
         </where>
     </select>