|
|
@@ -455,10 +455,10 @@
|
|
|
b.payee_id as payeeId, b.payer_id as payerId, b.transaction_amount as transactionAmount,
|
|
|
b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel,
|
|
|
b.remarks, b.confirm_sign confirmSign, b.delete_sign deleteSign, b.financial_pay_no as financialPayNo,
|
|
|
- b.financial_pay_time as financialPayTimes, u.nickname as payerName, a.name as payeeName
|
|
|
+ b.financial_pay_time as financialPayTimes, u.nickname as payerName, a.nickname as payeeName
|
|
|
from t_order_bill_new b
|
|
|
left join `user` u on b.payer_id = u.id
|
|
|
- left join admin a on b.payee_id = a.id
|
|
|
+ left join `user` a on b.payee_id = a.id
|
|
|
where b.delete_sign = 0 and bill_no = #{_parameter,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
<!-- 根据订单编号查看该订单相关的所有流水 -->
|
|
|
@@ -468,23 +468,23 @@
|
|
|
b.payee_id as payeeId, b.payer_id as payerId, b.transaction_amount as transactionAmount,
|
|
|
b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel,
|
|
|
b.remarks, b.confirm_sign confirmSign, b.delete_sign deleteSign, b.financial_pay_no as financialPayNo,
|
|
|
- b.financial_pay_time as financialPayTimes, u.nickname as payerName, a.name as payeeName
|
|
|
+ b.financial_pay_time as financialPayTimes, u.nickname as payerName, a.nickname as payeeName
|
|
|
from t_order_bill_new b
|
|
|
left join `user` u on b.payer_id = u.id
|
|
|
- left join admin a on b.payee_id = a.id
|
|
|
+ left join `user` a on b.payee_id = a.id
|
|
|
where b.delete_sign = 0 and order_no = #{_parameter,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
<!-- 查看自己创建的流水数据 -->
|
|
|
<select id="myBillList" parameterType="Map" resultType="com.goafanti.common.model.TOrderBillNew">
|
|
|
select
|
|
|
b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,
|
|
|
- b.payer_id as payerId, b.payee_id as payeeId, u.nickname as payerName, a.name as payeeName,
|
|
|
+ b.payer_id as payerId, b.payee_id as payeeId, u.nickname as payerName, a.nickname as payeeName,
|
|
|
b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel,
|
|
|
b.financial_pay_time as financialPayTimes,b.financial_pay_no as financialPayNo,
|
|
|
b.creater, ad.name as createrName, o.salesman_id as saleId, oa.name as saleName
|
|
|
from t_order_bill_new b
|
|
|
left join `user` u on b.payer_id = u.id
|
|
|
- left join admin a on b.payee_id = a.id
|
|
|
+ left join `user` a on b.payee_id = a.id
|
|
|
left join admin ad on b.creater = ad.id
|
|
|
left join t_order_new o on o.order_no = b.order_no
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
@@ -498,7 +498,7 @@
|
|
|
</if>
|
|
|
<if test='b.payeeName != null and b.payeeName != ""'>
|
|
|
<bind name="n" value="'%' + b.payeeName + '%'"/>
|
|
|
- and a.name like #{n,jdbcType=VARCHAR}
|
|
|
+ and a.nickname like #{n,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test='b.departmentId != null and b.departmentId != "" '>
|
|
|
and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
|
|
|
@@ -517,7 +517,7 @@
|
|
|
select count(*)
|
|
|
from t_order_bill_new b
|
|
|
left join `user` u on b.payer_id = u.id
|
|
|
- left join admin a on b.payee_id = a.id
|
|
|
+ left join `user` a on b.payee_id = a.id
|
|
|
left join t_order_new o on o.order_no = b.order_no
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
where b.delete_sign = 0
|
|
|
@@ -530,7 +530,7 @@
|
|
|
</if>
|
|
|
<if test='b.payeeName != null and b.payeeName != ""'>
|
|
|
<bind name="n" value="'%' + b.payeeName + '%'"/>
|
|
|
- and a.name like #{n,jdbcType=VARCHAR}
|
|
|
+ and a.nickname like #{n,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test='b.departmentId != null and b.departmentId != "" '>
|
|
|
and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
|
|
|
@@ -547,7 +547,7 @@
|
|
|
d.id as departmentId, d.name as departmentName
|
|
|
from t_order_bill_new b
|
|
|
left join `user` u on b.payer_id = u.id
|
|
|
- left join admin a on b.payee_id = a.id
|
|
|
+ left join `user` a on b.payee_id = a.id
|
|
|
left join t_order_new o on o.order_no = b.order_no
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
left join department d on oa.department_id = d.id
|
|
|
@@ -559,7 +559,7 @@
|
|
|
</if>
|
|
|
<if test='payeeName != null and payeeName != ""'>
|
|
|
<bind name="n" value="'%' + payeeName + '%'"/>
|
|
|
- and a.name like #{n,jdbcType=VARCHAR}
|
|
|
+ and a.nickname like #{n,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test='startTime != null and startTime != "" and endTime != null and endTime != ""'>
|
|
|
<bind name="a" value="startTime + ' 00:00:00'"/>
|
|
|
@@ -571,13 +571,13 @@
|
|
|
<select id="getBillData" parameterType="com.goafanti.common.model.TOrderBillNew" resultType="com.goafanti.common.model.TOrderBillNew">
|
|
|
select
|
|
|
b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,
|
|
|
- u.nickname as payerName, a.name as payeeName,
|
|
|
+ u.nickname as payerName, a.nickname as payeeName,
|
|
|
b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel,
|
|
|
b.financial_pay_time as financialPayTimes,b.financial_pay_no as financialPayNo,
|
|
|
b.creater, ad.name as createrName, oa.name as saleName, b.create_time as createTime
|
|
|
from t_order_bill_new b
|
|
|
left join `user` u on b.payer_id = u.id
|
|
|
- left join admin a on b.payee_id = a.id
|
|
|
+ left join `user` a on b.payee_id = a.id
|
|
|
left join admin ad on b.creater = ad.id
|
|
|
left join t_order_new o on o.order_no = b.order_no
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
@@ -588,7 +588,7 @@
|
|
|
</if>
|
|
|
<if test='payeeName != null and payeeName != ""'>
|
|
|
<bind name="n" value="'%' + payeeName + '%'"/>
|
|
|
- and a.name like #{n,jdbcType=VARCHAR}
|
|
|
+ and a.nickname like #{n,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test='departmentId != null and departmentId != "" '>
|
|
|
and oa.department_id = #{departmentId,jdbcType=VARCHAR}
|