|
@@ -110,7 +110,7 @@
|
|
|
LEFT JOIN sc_user scu on scu.id = ppr.create_by
|
|
|
LEFT JOIN pay_pay_transactiondetails ppt on ppt.payseriesno = ppr.payseriesno and ppt.transtype = 4
|
|
|
<where>
|
|
|
- ppr.canceledrecord_id is null and ppr.iscanceled =0
|
|
|
+ ppr.canceledrecord_id is null and ppr.iscanceled =0 and ppr.payway != 5
|
|
|
<if test="customerId != null"> and ppr.customer_id = #{customerId}</if>
|
|
|
<if test="siteId != null"> and ppr.site_id = #{siteId}</if>
|
|
|
<if test="community != null and community != ''"> and scc.code = #{community,jdbcType=VARCHAR} </if>
|
|
@@ -138,6 +138,7 @@
|
|
|
LEFT JOIN sc_community scc on scc.`code` = substring(ppt.accountnumber,1,3) and scc.`status`=1 and scc.customer_id =#{customerId}
|
|
|
LEFT JOIN sc_user scu on scu.id = ppt.create_by
|
|
|
WHERE ppt.canceledrecord_id is null and ppt.iscanceled =0 and ppt.transtype != 4 AND ppt.transtype != 2 and ppt.transamount>0
|
|
|
+ and ppt.payway != 5
|
|
|
<if test="customerId != null"> and ppt.customer_id = #{customerId}</if>
|
|
|
<if test="siteId != null"> and ppt.site_id = #{siteId}</if>
|
|
|
<if test="community != null and community != ''"> and scc.code = #{community,jdbcType=VARCHAR} </if>
|