yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

列表金额统计，完成状态修改

This commit is contained in:
曹磊 2024-07-09 20:49:49 +08:00
parent 312272d081
commit b62fc99d2b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/mapper/artificer/OrdersDao.xml
View File

@ -393,7 +393,7 @@
left join tb_user u on u.user_id=o1.user_id left join tb_user u on u.user_id=o1.user_id
left join consortia c on c.consortia_id=o1.consortia_id left join consortia c on c.consortia_id=o1.consortia_id
where o1.old_orders_id is not null where o1.old_orders_id is not null
and o1.status != 11 and o1.status not in (4,11,15)
<if test="userPackageId!=null"> <if test="userPackageId!=null">
and (o2.user_package_id = #{userPackageId} or o3.user_package_id = #{userPackageId}) and (o2.user_package_id = #{userPackageId} or o3.user_package_id = #{userPackageId})
</if> </if>
@ -418,10 +418,15 @@
left join tb_user u on u.user_id=o1.user_id left join tb_user u on u.user_id=o1.user_id
left join consortia c on c.consortia_id=o1.consortia_id left join consortia c on c.consortia_id=o1.consortia_id
where o1.parent_id = 0 where o1.parent_id = 0
and o1.status != 11
and o1.orders_id not in ( and o1.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4
)
and o1.orders_id not in (
select old_orders_id from orders
where old_orders_id is not null
and status != 4
) )
<if test="userPackageId!=null"> <if test="userPackageId!=null">
and o1.user_package_id = #{userPackageId} and o1.user_package_id = #{userPackageId}
@ -661,7 +666,7 @@
LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.old_orders_id is not null and o.old_orders_id is not null
and o.status != 11 and o1.status not in (4,11,15)
<if test="type==1"> <if test="type==1">
and date_format(o.serve_time,'%Y-%m-%d %H:%i') >= date_format(DATE_ADD(now(), INTERVAL -12 HOUR),'%Y-%m-%d %H:%i') and date_format(o.serve_time,'%Y-%m-%d %H:%i') >= date_format(DATE_ADD(now(), INTERVAL -12 HOUR),'%Y-%m-%d %H:%i')
and date_format(o.serve_time,'%Y-%m-%d %H:%i') &lt;= date_format(DATE_ADD(now(), INTERVAL 24 HOUR),'%Y-%m-%d %H:%i') and date_format(o.serve_time,'%Y-%m-%d %H:%i') &lt;= date_format(DATE_ADD(now(), INTERVAL 24 HOUR),'%Y-%m-%d %H:%i')
@ -709,10 +714,15 @@
LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.status != 11 and o1.orders_id not in (
and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4
)
and o1.orders_id not in (
select old_orders_id from orders
where old_orders_id is not null
and status != 4
) )
<if test="type==1"> <if test="type==1">
and date_format(o.serve_time,'%Y-%m-%d %H:%i') >= date_format(DATE_ADD(now(), INTERVAL -12 HOUR),'%Y-%m-%d %H:%i') and date_format(o.serve_time,'%Y-%m-%d %H:%i') >= date_format(DATE_ADD(now(), INTERVAL -12 HOUR),'%Y-%m-%d %H:%i')