From d2985d31ba7b387749b2350882172f675b923347 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 16:22:38 +0800
Subject: [PATCH] 订单流程补充
---
oying-system/src/main/resources/mapper/system/MerchantMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/system/MerchantMapper.xml b/oying-system/src/main/resources/mapper/system/MerchantMapper.xml
index 1c9d082..d0e02ff 100644
--- a/oying-system/src/main/resources/mapper/system/MerchantMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/MerchantMapper.xml
@@ -3,6 +3,7 @@
<mapper namespace="com.oying.modules.system.mapper.MerchantMapper">
<resultMap id="BaseResultMap" type="com.oying.modules.system.domain.Merchant">
<id column="merchant_id" property="merchantId"/>
+ <result column="merchant_type" property="merchantType"/>
<result column="merchant_name" property="merchantName"/>
<result column="merchant_code" property="merchantCode"/>
<result column="business_license" property="businessLicense"/>
@@ -20,7 +21,7 @@
</resultMap>
<sql id="Base_Column_List">
- merchant_id, merchant_name, merchant_code, business_license, business_license_path, contact_mobile, merchant_sort, enabled, create_by, update_by, create_time, update_time, audit_user, audit_time, audit_message
+ merchant_id, merchant_type, merchant_name, merchant_code, business_license, business_license_path, contact_mobile, merchant_sort, enabled, create_by, update_by, create_time, update_time, audit_user, audit_time, audit_message
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -36,6 +37,9 @@
or contact_mobile like concat('%', #{criteria.blurry}, '%')
)
</if>
+ <if test="criteria.merchantType != null and criteria.merchantType != ''">
+ and merchant_type = #{criteria.merchantType}
+ </if>
<if test="criteria.enabled != null">
and enabled = #{criteria.enabled}
</if>
--
Gitblit v1.9.3