Compare commits
No commits in common. "6f4398d058ecebd5dd6f08c1ccfd415a8217b8f8" and "3685685d56a2d36a15efa33b96a016587740030e" have entirely different histories.
6f4398d058
...
3685685d56
|
@ -1194,11 +1194,10 @@
|
|||
|
||||
<select id="getChongzhiList" resultType="com.sqx.modules.artificer.entity.Orders">
|
||||
select
|
||||
o.*,uu.user_recharge as userRecharge,b.massage_img
|
||||
o.*,uu.user_recharge as userRecharge
|
||||
from orders o
|
||||
left join artificer a on a.artificer_id=o.artificer_id
|
||||
left join user_recharge uu on uu.orders_id = o.orders_id
|
||||
left join massage_type b on o.massage_type_id = b.massage_type_id
|
||||
where o.artificer_id=#{userId} and o.parent_id = 0
|
||||
and o.status in (3,5)
|
||||
and o.end_times BETWEEN #{startTime} and #{endTime}
|
||||
|
|
Loading…
Reference in New Issue