Authored by qinchao

fix:人工打款显示,打过款的记录不显示

@@ -33,13 +33,14 @@ @@ -33,13 +33,14 @@
33 and uid = #{billsTradeReq.uid} 33 and uid = #{billsTradeReq.uid}
34 </if> 34 </if>
35 and income_outcome=1 35 and income_outcome=1
  36 + and deal_status != 1
36 <if test="billsTradeReq.status != null "> 37 <if test="billsTradeReq.status != null ">
37 <choose> 38 <choose>
38 <when test="billsTradeReq.status == 100 "> 39 <when test="billsTradeReq.status == 100 ">
39 and trade_status = 100 40 and trade_status = 100
40 </when> 41 </when>
41 <otherwise> 42 <otherwise>
42 - and trade_status != 100 and deal_status != 1 43 + and trade_status != 100
43 </otherwise> 44 </otherwise>
44 </choose> 45 </choose>
45 </if> 46 </if>