From 118623071a97b66f21c29e2bc02b8f15855ede5d Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期三, 25 九月 2024 19:54:11 +0800
Subject: [PATCH] 均价计算 优化
---
src/main/resources/mapper/partner/PartnerMapper.xml | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/partner/PartnerMapper.xml b/src/main/resources/mapper/partner/PartnerMapper.xml
index 473fe1d..7a33c98 100644
--- a/src/main/resources/mapper/partner/PartnerMapper.xml
+++ b/src/main/resources/mapper/partner/PartnerMapper.xml
@@ -3,13 +3,22 @@
<mapper namespace="com.mzl.flower.mapper.partner.PartnerMapper">
<select id="queryPartner" resultType="com.mzl.flower.dto.response.partner.PartnerDTO">
- select * from t_partner_info t where t.deleted= 0
+ select t.* ,u.login_name
+ from t_partner_info t
+ left join t_user u
+ on t.user_id=u.id
+ and u.type='partner'
+ where t.deleted= 0
<if test="dto.name!=null and dto.name!=''">
AND t.name LIKE CONCAT('%',#{dto.name}, '%')
</if>
<if test="dto.tel!=null and dto.tel!=''">
AND t.contact_tel LIKE CONCAT('%',#{dto.tel}, '%')
</if>
+ <if test="dto.loginName!=null and dto.loginName!=''">
+ AND u.login_name LIKE CONCAT('%',#{dto.loginName}, '%')
+ </if>
+
<if test="dto.status!=null and dto.status!=''">
AND t.status = #{dto.status}
</if>
@@ -32,14 +41,17 @@
<if test="dto.region!=null and dto.region!=''">
AND t.region like CONCAT('%',#{dto.region}, '%')
</if>
+ <if test="dto.isEnabled!=null">
+ AND t.is_enabled = #{dto.isEnabled}
+ </if>
order by t.create_time desc
</select>
<select id="getCurrentPartner" resultType="com.mzl.flower.dto.response.partner.PartnerDTO"
parameterType="java.lang.String">
select * from t_partner_info t where t.deleted= 0 AND t.user_id = #{userId}
</select>
- <select id="getByIdOrUserId" resultType="com.mzl.flower.entity.partner.Partner"
- parameterType="java.lang.String">
- select * from t_partner_info t where t.deleted= 0 AND (t.id = #{partnerUserId} or t.user_id = #{partnerUserId})
- </select>
+<!-- <select id="getByIdOrUserId" resultType="com.mzl.flower.entity.partner.Partner"-->
+<!-- parameterType="java.lang.String">-->
+<!-- select * from t_partner_info t where t.deleted= 0 AND (t.id = #{partnerUserId} or t.user_id = #{partnerUserId})-->
+<!-- </select>-->
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3