Ver código fonte

自由职业者、合作商户走外部通道的不显示

LiFei 4 anos atrás
pai
commit
003c9d36ef

+ 3 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/mapper/xml/HlwPaymentDetailMapper.xml

@@ -197,6 +197,7 @@
 		<where>
 			${ew.sqlSegment}
 			and a.status=3
+			and hp.payment_lane=1
 			<if test="hlwPaymentDetail.subcontractorId != null and hlwPaymentDetail.subcontractorId !=''">
 				and hp.subcontractor_id = #{hlwPaymentDetail.subcontractorId}
 			</if>
@@ -254,6 +255,7 @@
 		<where>
 			${ew.sqlSegment}
 			and a.status=3
+			and hp.payment_lane=1
 			<if test="hlwPaymentDetail.subcontractorId != null and hlwPaymentDetail.subcontractorId !=''">
 				and hp.subcontractor_id = #{hlwPaymentDetail.subcontractorId}
 			</if>
@@ -325,6 +327,7 @@
 		and (to_days(hp.create_time) between to_days(hus.start_date) and to_days(hus.end_date)) end
 		<where>
 			a.status=3
+			and hp.payment_lane=1
 			and a.idcard_number=#{hlwPaymentDetail.idcardNumber}
 			<if test="hlwPaymentDetail.subcontractorId != null">
 				and  hp.subcontractor_id=#{hlwPaymentDetail.subcontractorId}

+ 5 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/xml/HlwSubcontractorAccountFlowMapper.xml

@@ -26,6 +26,7 @@
             ${ew.sqlSegment}
             and a.type=0
             and a.is_through_platform=0
+            and hp.payment_lane=1
             <if test="hlwSubcontractorAccountFlow.subcontractorId != null and hlwSubcontractorAccountFlow.subcontractorId !=''">
                 and hp.subcontractor_id = #{hlwSubcontractorAccountFlow.subcontractorId}
             </if>
@@ -61,6 +62,7 @@
             ${ew.sqlSegment}
             and a.type=0
             and a.is_through_platform=1
+            and hp.payment_lane=1
             <if test="hlwSubcontractorAccountFlow.subcontractorId != null and hlwSubcontractorAccountFlow.subcontractorId !=''">
                 and hp.subcontractor_id = #{hlwSubcontractorAccountFlow.subcontractorId}
             </if>
@@ -111,6 +113,7 @@
             ${ew.sqlSegment}
             and a.type=0
             and a.is_through_platform=0
+            and hp.payment_lane=1
             <if test="hlwSubcontractorAccountFlow.subcontractorId != null and hlwSubcontractorAccountFlow.subcontractorId !=''">
                 and hp.subcontractor_id = #{hlwSubcontractorAccountFlow.subcontractorId}
             </if>
@@ -145,6 +148,7 @@
             ${ew.sqlSegment}
             and a.type=0
             and a.is_through_platform=1
+            and hp.payment_lane=1
             <if test="hlwSubcontractorAccountFlow.subcontractorId != null and hlwSubcontractorAccountFlow.subcontractorId !=''">
                 and hp.subcontractor_id = #{hlwSubcontractorAccountFlow.subcontractorId}
             </if>
@@ -200,6 +204,7 @@
 
 
             a.type=0
+            and hpa.payment_lane=1
             and a.is_through_platform=#{hlwSubcontractorAccountFlow.isThroughPlatform}
             <if test="hlwSubcontractorAccountFlow.paymentResultTime_begin != null and hlwSubcontractorAccountFlow.paymentResultTime_begin !=''">
                 and a.create_time between #{hlwSubcontractorAccountFlow.paymentResultTime_begin} and #{hlwSubcontractorAccountFlow.paymentResultTime_end}