|
|
@@ -1047,7 +1047,7 @@
|
|
|
,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
- ,f.name as consultantName
|
|
|
+ ,f.name as consultantName,a.settlement_amount as settlementAmount
|
|
|
</if>
|
|
|
from t_order_new a left join `user` b on a.buyer_id=b.id
|
|
|
left join admin c on a.salesman_id=c.id
|
|
|
@@ -1137,6 +1137,7 @@
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
and a.process_status in (4,5,6)
|
|
|
+ and a.order_status not in(5,7)
|
|
|
</if>
|
|
|
<if test="specially == 5">
|
|
|
and c.department_id=(select department_id from admin where id= #{aid,jdbcType=VARCHAR})
|