|
|
@@ -655,13 +655,11 @@
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
|
|
|
a.transaction_subject as transactionSubject,
|
|
|
a.transaction_amount as transactionAmount,
|
|
|
- b.commodity_id as commodityId,
|
|
|
- b.commodity_type as commodityType,
|
|
|
a.confirm_sign as confirmSign
|
|
|
from
|
|
|
- t_funding_records a left join t_order b on a.order_no = b.order_no
|
|
|
+ t_funding_records a
|
|
|
where
|
|
|
- (a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and b.delete_sign = 0
|
|
|
+ (a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR})
|
|
|
<if test="orderNo != null and orderNo != ''">
|
|
|
and a.order_no = #{orderNo,jdbcType=BIGINT}
|
|
|
</if>
|
|
|
@@ -675,9 +673,9 @@
|
|
|
select
|
|
|
count(0)
|
|
|
from
|
|
|
- t_funding_records a left join t_order b on a.order_no = b.order_no
|
|
|
+ t_funding_records a
|
|
|
where
|
|
|
- (a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and b.delete_sign = 0
|
|
|
+ (a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR})
|
|
|
<if test="orderNo != null and orderNo != ''">
|
|
|
a.order_no = #{orderNo,jdbcType=BIGINT}
|
|
|
</if>
|