From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/PayFeeDetailDiscountServiceDaoImplMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeDetailDiscountServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeDetailDiscountServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 5254779..70b13b3
--- a/java110-db/src/main/resources/mapper/fee/PayFeeDetailDiscountServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeDetailDiscountServiceDaoImplMapper.xml
@@ -100,8 +100,11 @@
select t.create_time,t.create_time createTime,t.detail_discount_id,t.detail_discount_id
detailDiscountId,t.discount_price,t.discount_price discountPrice,t.detail_id,t.detail_id
detailId,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id bId,t.community_id,t.community_id
- communityId,t.discount_id,t.discount_id discountId,t.fee_id,t.fee_id feeId
+ communityId,t.discount_id,t.discount_id discountId,t.fee_id,t.fee_id feeId,fd.discount_name discountName,
+ fd.discount_type discountType,fdr.rule_name,fdr.rule_name ruleName
from pay_fee_detail_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'
+ left join fee_discount_rule fdr on fd.rule_id = fdr.rule_id and fdr.status_cd = '0'
where 1 =1
<if test="createTime !=null and createTime != ''">
and t.create_time= #{createTime}
--
Gitblit v1.8.0