From 982313135d1c239fe3b20e4c5664781f92d40aca Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:17:39 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml b/oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml
index ac3cb3d..8182980 100644
--- a/oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml
+++ b/oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml
@@ -13,12 +13,17 @@
<result property="storeName" column="store_name"/>
<result property="businessScope" column="business_scope"/>
<result property="status" column="status"/>
+ <result property="businessStatus" column="business_status"/>
+ <result property="auditStatus" column="audit_status"/>
<result property="logoImageId" column="logo_image_id"/>
+ <result property="logoImageUrl" column="logo_image_url"/>
<result property="coverImageId" column="cover_image_id"/>
+ <result property="coverImageUrl" column="cover_image_url"/>
<result property="description" column="description"/>
<result property="tags" column="tags"/>
<result property="deliveryFee" column="delivery_fee"/>
<result property="deliveryMinimum" column="delivery_minimum"/>
+ <result property="packagingFee" column="packaging_fee"/>
<result property="contactPhone" column="contact_phone"/>
<result property="openTime" column="open_time"/>
<result property="closeTime" column="close_time"/>
@@ -28,25 +33,25 @@
<result property="geoHash" column="geo_hash"/>
<result property="coordinateSystem" column="coordinate_system"/>
<result property="radius" column="radius"/>
- <result column="returns" property="returns"/>
- <result column="self_pickup" property="selfPickup"/>
+ <result property="returns" column="returns" />
+ <result property="selfPickup" column="self_pickup"/>
<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"/>
+ <result property="version" column="version"/>
</resultMap>
<sql id="store_column_list">
- store_id, merchant_id, platform_category_id, store_type, store_code, store_name, business_scope, status, logo_image_id,
- cover_image_id, description, tags, delivery_fee, delivery_minimum, contact_phone, open_time, close_time,
+ store_id, merchant_id, platform_category_id, store_type, store_code, store_name, business_scope, status, business_status, audit_status, logo_image_id, logo_image_url,
+ cover_image_id, cover_image_url, description, tags, delivery_fee, delivery_minimum, packaging_fee, contact_phone, open_time, close_time,
address, longitude, latitude, geo_hash, geo_point, coordinate_system, radius, returns, self_pickup, create_by, create_time, update_by, update_time, version
</sql>
<sql id="selectStoreVo">
select
- store_id, merchant_id, platform_category_id, store_type, store_code, store_name, business_scope, status, logo_image_id,
- cover_image_id, description, tags, delivery_fee, delivery_minimum, contact_phone, open_time, close_time,
+ store_id, merchant_id, platform_category_id, store_type, store_code, store_name, business_scope, status, business_status, audit_status, logo_image_id, logo_image_url,
+ cover_image_id, cover_image_url, description, tags, delivery_fee, delivery_minimum, packaging_fee, contact_phone, open_time, close_time,
address, longitude, latitude, geo_hash, geo_point, coordinate_system, radius, returns, self_pickup, create_by, create_time, update_by, update_time, version from pc_store
</sql>
@@ -122,12 +127,12 @@
<!-- 店铺名称模糊查询 AND s.name LIKE CONCAT('%', #{criteria.blurry}, '%') -->
<if test="criteria.blurry != null and criteria.blurry != ''">
- AND MATCH(s.store_name) AGAINST(#{criteria.blurry} IN NATURAL LANGUAGE MODE)
+ AND s.store_name like concat('%', #{criteria.blurry}, '%')
</if>
<!-- 营业状态 -->
- <if test="criteria.status != null">
- AND s.status = #{criteria.status}
+ <if test="criteria.businessStatus != null">
+ AND s.business_status = #{criteria.businessStatus}
</if>
<!-- 类目ID -->
@@ -140,6 +145,16 @@
</if>
</select>
+ <select id="queryByIds" resultMap="StoreResult">
+ SELECT
+ <include refid="store_column_list"/>
+ FROM pc_store
+ WHERE store_id IN
+ <foreach collection="ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
+
<select id="queryUserStores" parameterType="java.lang.Long" resultMap="StoreResult">
SELECT s.*
FROM sys_user_store u INNER JOIN pc_store s ON u.store_id = s.store_id
--
Gitblit v1.9.3