From db689e5e2cb730b2cf08796fa224084f00758a71 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 12 三月 2022 17:05:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml | 147 ++++++++++++++++++++++++-------------------------
1 files changed, 72 insertions(+), 75 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 83a727e..5e8a6fd
--- a/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
@@ -4,94 +4,91 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="payFeeConfigDiscountServiceDaoImpl">
-
-
-
-
<!-- 淇濆瓨璐圭敤椤规姌鎵ｄ俊鎭� add by wuxw 2018-07-03 -->
<insert id="savePayFeeConfigDiscountInfo" parameterType="Map">
insert into pay_fee_config_discount(
-config_discount_id,config_id,discount_id,community_id
-) values (
-#{configDiscountId},#{configId},#{discountId},#{communityId}
-)
+ config_discount_id,config_id,discount_id,community_id,start_time,end_time,paymax_end_time
+ ) values (
+ #{configDiscountId},#{configId},#{discountId},#{communityId},#{startTime},#{endTime},#{payMaxEndTime}
+ )
</insert>
-
-
<!-- 鏌ヨ璐圭敤椤规姌鎵ｄ俊鎭� add by wuxw 2018-07-03 -->
<select id="getPayFeeConfigDiscountInfo" parameterType="Map" resultType="Map">
- select t.config_discount_id,t.config_discount_id configDiscountId,t.config_id,t.config_id configId,t.status_cd,t.status_cd statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id communityId
-from pay_fee_config_discount t
-where 1 =1
-<if test="configDiscountId !=null and configDiscountId != ''">
- and t.config_discount_id= #{configDiscountId}
-</if>
-<if test="configId !=null and configId != ''">
- and t.config_id= #{configId}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="discountId !=null and discountId != ''">
- and t.discount_id= #{discountId}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
-
+ select t.config_discount_id,t.config_discount_id configDiscountId,t.config_id,t.config_id
+ configId,t.status_cd,t.status_cd statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id
+ communityId,fd.discount_name discountName,fd.discount_type discountType,t.start_time startTime,t.end_time endTime,t.paymax_end_time payMaxEndTime
+ from pay_fee_config_discount t
+ left join fee_discount fd on t.discount_id = fd.discount_id and t.community_id = fd.community_id and fd.status_cd = '0'
+ where 1 =1
+ <if test="configDiscountId !=null and configDiscountId != ''">
+ and t.config_discount_id= #{configDiscountId}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="discountId !=null and discountId != ''">
+ and t.discount_id= #{discountId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="currentTime !=null ">
+ and t.start_time < #{currentTime}
+ </if>
+ <if test="currentTime !=null ">
+ and t.end_time > #{currentTime}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
-
-
-
<!-- 淇敼璐圭敤椤规姌鎵ｄ俊鎭� add by wuxw 2018-07-03 -->
<update id="updatePayFeeConfigDiscountInfo" parameterType="Map">
- update pay_fee_config_discount t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="configId !=null and configId != ''">
-, t.config_id= #{configId}
-</if>
-<if test="discountId !=null and discountId != ''">
-, t.discount_id= #{discountId}
-</if>
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if>
- where 1=1 <if test="configDiscountId !=null and configDiscountId != ''">
-and t.config_discount_id= #{configDiscountId}
-</if>
-
+ update pay_fee_config_discount t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="configId !=null and configId != ''">
+ , t.config_id= #{configId}
+ </if>
+ <if test="discountId !=null and discountId != ''">
+ , t.discount_id= #{discountId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ , t.community_id= #{communityId}
+ </if>
+ where 1=1
+ <if test="configDiscountId !=null and configDiscountId != ''">
+ and t.config_discount_id= #{configDiscountId}
+ </if>
</update>
<!-- 鏌ヨ璐圭敤椤规姌鎵ｆ暟閲� add by wuxw 2018-07-03 -->
- <select id="queryPayFeeConfigDiscountsCount" parameterType="Map" resultType="Map">
- select count(1) count
-from pay_fee_config_discount t
-where 1 =1
-<if test="configDiscountId !=null and configDiscountId != ''">
- and t.config_discount_id= #{configDiscountId}
-</if>
-<if test="configId !=null and configId != ''">
- and t.config_id= #{configId}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="discountId !=null and discountId != ''">
- and t.discount_id= #{discountId}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
-
-
- </select>
+ <select id="queryPayFeeConfigDiscountsCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from pay_fee_config_discount t
+ where 1 =1
+ <if test="configDiscountId !=null and configDiscountId != ''">
+ and t.config_discount_id= #{configDiscountId}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="discountId !=null and discountId != ''">
+ and t.discount_id= #{discountId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.8.0