From cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 17:02:08 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml | 147 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 112 insertions(+), 35 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index c34c993..29ea58e
--- a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -7,12 +7,14 @@
<!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessFeeConfigInfo" parameterType="Map">
insert into business_pay_fee_config(
- fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
+ fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text
) values (
- #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},#{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId}
+ #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},
+ #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType},#{paymentCd},#{paymentCycle},
+ #{computingFormulaText}
)
</insert>
-
<!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessFeeConfigInfo" parameterType="Map" resultType="Map">
@@ -20,7 +22,8 @@
computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.square_price,t.square_price
squarePrice,t.is_default,t.is_default isDefault,t.operate,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time startTime,t.end_time,t.end_time
- endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
+ endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.bill_type,t.bill_type billType,
+ t.payment_cd,t.payment_cycle,t.computing_formula_text,t.computing_formula_text computingFormulaText
from business_pay_fee_config t
where 1 =1
<if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -29,10 +32,10 @@
<if test="computingFormula !=null and computingFormula != ''">
and t.computing_formula= #{computingFormula}
</if>
- <if test="additionalAmount !=null and additionalAmount != ''">
+ <if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
and t.additional_amount= #{additionalAmount}
</if>
- <if test="squarePrice !=null and squarePrice != ''">
+ <if test="squarePrice !=null and squarePrice != '' or squarePrice == 0">
and t.square_price= #{squarePrice}
</if>
<if test="isDefault !=null and isDefault != ''">
@@ -48,12 +51,15 @@
and t.fee_flag= #{feeFlag}
</if>
<if test="feeName !=null and feeName != ''">
- and t.fee_name= #{feeName}
+ and t.fee_name like '%${feeName}%'
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="billType !=null and billType != ''">
+ and t.bill_type= #{billType}
+ </if>
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
<if test="communityId !=null and communityId != ''">
@@ -62,16 +68,17 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</select>
-
<!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveFeeConfigInfoInstance" parameterType="Map">
insert into pay_fee_config(
- fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
+ fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text
) select
- t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,t.start_time,t.end_time,t.community_id,t.b_id
+ t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,
+ t.start_time,t.end_time,t.community_id,
+ t.b_id,t.bill_type,t.payment_cd,t.payment_cycle,t.computing_formula_text
from business_pay_fee_config t where 1=1
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
@@ -98,10 +105,13 @@
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="billType !=null and billType != ''">
+ and t.bill_type= #{billType}
+ </if>
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
<if test="communityId !=null and communityId != ''">
@@ -110,9 +120,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</insert>
-
<!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
<select id="getFeeConfigInfo" parameterType="Map" resultType="Map">
@@ -120,9 +128,21 @@
computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.status_cd,t.status_cd
statusCd,t.square_price,t.square_price squarePrice,t.is_default,t.is_default isDefault,t.config_id,t.config_id
configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
- startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
- from pay_fee_config t
+ startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+ td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,td3.name billTypeName,
+ t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle,
+ t.computing_formula_text,t.computing_formula_text computingFormulaText
+ from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
where 1 =1
+ and t.fee_type_cd = td1.status_cd
+ and td1.table_name = 'pay_fee_config'
+ and td1.table_columns = 'fee_type_cd'
+ and t.fee_flag = td2.status_cd
+ and td2.table_name = 'pay_fee_config'
+ and td2.table_columns = 'fee_flag'
+ and t.bill_type = td3.status_cd
+ and td3.table_name = 'pay_fee_config'
+ and td3.table_columns = 'bill_type'
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
</if>
@@ -148,13 +168,23 @@
and t.fee_flag= #{feeFlag}
</if>
<if test="feeName !=null and feeName != ''">
- and t.fee_name= #{feeName}
+ and t.fee_name like '%${feeName}%'
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="feeNameEq !=null and feeNameEq != ''">
+ and t.fee_name = #{feeNameEq}
+ </if>
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
+ </if>
+ <if test="valid !=null and valid == 1">
+ and t.end_time > now()
+ </if>
+ <if test="curTime !=null ">
+ and t.end_time > #{curTime}
+ and t.start_time < #{curTime}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -162,13 +192,20 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
+ <if test="paymentCd !=null and paymentCd != ''">
+ and t.payment_cd= #{paymentCd}
+ </if>
+ <if test="paymentCycle !=null and paymentCycle != ''">
+ and t.payment_cycle= #{paymentCycle}
+ </if>
+ <if test="billType !=null and billType != ''">
+ and t.bill_type= #{billType}
+ </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="updateFeeConfigInfoInstance" parameterType="Map">
@@ -182,11 +219,20 @@
<if test="computingFormula !=null and computingFormula != ''">
, t.computing_formula= #{computingFormula}
</if>
- <if test="additionalAmount !=null and additionalAmount != ''">
+ <if test="computingFormulaText !=null and computingFormulaText != ''">
+ , t.computing_formula_text= #{computingFormulaText}
+ </if>
+ <if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
, t.additional_amount= #{additionalAmount}
</if>
- <if test="squarePrice !=null and squarePrice != ''">
+ <if test="squarePrice !=null and squarePrice != '' or squarePrice == 0">
, t.square_price= #{squarePrice}
+ </if>
+ <if test="paymentCd !=null and paymentCd != ''">
+ , t.payment_cd= #{paymentCd}
+ </if>
+ <if test="paymentCycle !=null and paymentCycle != ''">
+ , t.payment_cycle= #{paymentCycle}
</if>
<if test="isDefault !=null and isDefault != ''">
, t.is_default= #{isDefault}
@@ -197,10 +243,13 @@
<if test="feeName !=null and feeName != ''">
, t.fee_name= #{feeName}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="billType !=null and billType != ''">
+ , t.bill_type= #{billType}
+ </if>
+ <if test="startTime !=null ">
, t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
, t.end_time= #{endTime}
</if>
<if test="communityId !=null and communityId != ''">
@@ -213,14 +262,22 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ璐圭敤閰嶇疆鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryFeeConfigsCount" parameterType="Map" resultType="Map">
select count(1) count
- from pay_fee_config t
+ from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
where 1 =1
+ and t.fee_type_cd = td1.status_cd
+ and td1.table_name = 'pay_fee_config'
+ and td1.table_columns = 'fee_type_cd'
+ and t.fee_flag = td2.status_cd
+ and td2.table_name = 'pay_fee_config'
+ and td2.table_columns = 'fee_flag'
+ and t.bill_type = td3.status_cd
+ and td3.table_name = 'pay_fee_config'
+ and td3.table_columns = 'bill_type'
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
</if>
@@ -246,13 +303,16 @@
and t.fee_flag= #{feeFlag}
</if>
<if test="feeName !=null and feeName != ''">
- and t.fee_name= #{feeName}
+ and t.fee_name like '%${feeName}%'
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
+ </if>
+ <if test="valid !=null and valid == 1">
+ and t.end_time > now()
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -260,8 +320,25 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
-
+ <if test="paymentCd !=null and paymentCd != ''">
+ and t.payment_cd= #{paymentCd}
+ </if>
+ <if test="paymentCycle !=null and paymentCycle != ''">
+ and t.payment_cycle= #{paymentCycle}
+ </if>
+ <if test="billType !=null and billType != ''">
+ and t.bill_type= #{billType}
+ </if>
</select>
+ <!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
+ <insert id="saveFeeConfig" parameterType="Map">
+ insert into pay_fee_config(
+ fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text
+ ) values (
+ #{feeTypeCd},#{computingFormula},#{additionalAmount},'0',#{squarePrice},#{isDefault},#{configId},
+ #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},'-1',#{billType},#{paymentCd},#{paymentCycle},#{computingFormulaText}
+ )
+ </insert>
</mapper>
--
Gitblit v1.8.0