From 919acbd3e8148ffc5dfabc6d6468fa90f868a3cc Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 21 Oct 2025 17:49:45 +0800
Subject: [PATCH] 邀请新用户记录添加
---
oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml b/oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml
index 43a18b8..c9caf4c 100644
--- a/oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml
+++ b/oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml
@@ -11,8 +11,9 @@
<result column="category_id" property="categoryId"/>
<result column="second_category_id" property="secondCategoryId"/>
<result column="status" property="status"/>
- <result column="main_image" property="mainImage"/>
- <result column="detail_image" property="detailImage"/>
+ <result column="shelf_status" property="shelfStatus"/>
+ <result column="main_image_id" property="mainImageId"/>
+ <result column="main_image_Url" property="mainImageUrl"/>
<result column="description" property="description"/>
<result column="price" property="price"/>
<result column="stock_quantity" property="stockQuantity"/>
@@ -22,18 +23,24 @@
<result column="width" property="width"/>
<result column="length" property="length"/>
<result column="height" property="height"/>
+ <result column="returns" property="returns"/>
+ <result column="self_pickup" property="selfPickup"/>
<result column="deleted_flag" property="deletedFlag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
<result column="version" property="version"/>
</resultMap>
<sql id="Base_Column_List">
- product_id, store_id, code, barcode, name, title, category_id, second_category_id, status, main_image, detail_image, description, price, stock_quantity, min_purchase_quantity, warn_stock, weight, width, length, height, deleted_flag, create_by, create_time, update_by, update_time, version
+ product_id, store_id, code, barcode, name, title, category_id, second_category_id, status, shelf_status, main_image_id, main_image_url, description, price, stock_quantity, min_purchase_quantity, warn_stock, weight, width, length, height, returns, self_pickup, deleted_flag, create_by, create_time, update_by, update_time, version
</sql>
<select id="findAll" resultMap="BaseResultMap">
- select
+ SELECT
<include refid="Base_Column_List"/>
- from pc_product
+ FROM pc_product
<where>
<if test="criteria.storeId != null">
and store_id = #{criteria.storeId}
@@ -50,11 +57,28 @@
<if test="criteria.status != null">
and status = #{criteria.status}
</if>
+ <if test="criteria.shelfStatus != null">
+ and shelf_status = #{criteria.shelfStatus}
+ </if>
<if test="criteria.active != null">
and active = #{criteria.active}
</if>
</where>
- order by product_id desc
+ <!--<if test="criteria.sortColumn != null and criteria.sortColumn != ''">
+ order by ${criteria.sortColumn} ${criteria.sortDirection}
+ </if>-->
+ ORDER BY
+ <choose>
+ <!-- 价格升序 -->
+ <when test="criteria.sortColumn == 'price' and criteria.sortDirection == 'asc'">price ASC</when>
+ <!-- 价格降序 -->
+ <when test="criteria.sortColumn == 'price' and criteria.sortDirection == 'desc'">price DESC</when>
+ <!-- 创建时间降序(默认) -->
+ <otherwise>create_time DESC</otherwise>
+ </choose>
+ <if test="criteria.limit != null">
+ LIMIT #{criteria.limit}
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3