From 871efa21e6c95520e9825ae1f2338c9a919fdd5d Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期日, 15 十月 2023 17:57:48 +0800
Subject: [PATCH] 用户端代码
---
src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml b/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
index 0c7736e..b72b366 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
+++ b/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
@@ -81,8 +81,8 @@
update t_order set pay_status =1 where id =#{number}
</update>
- <select id="getReceivable" resultType="com.stylefeng.guns.modular.system.model.ReceivableVo">
- select id,invoice_number invoiceNumber,pay_time invoiceTime ,allTotal total, case 1 when paid=allTotal THEN 1 else 2 end as state ,change from t_order
+ <select id="getReceivable" resultType="com.stylefeng.guns.modular.system.model.ReceivableVo">
+ select id,invoice_number invoiceNumber,pay_time invoiceTime ,allTotal total, case 1 when paid=allTotal THEN 1 else 2 end as state ,`change` from t_order
where user_id =#{userId} and status !=17
<if test="sTime !=null">
and pay_time between #{sTime} and #{eTime}
@@ -186,10 +186,10 @@
FROM
t_order t1
LEFT JOIN t_goods t2 ON t1.id = t2.order_id
- LEFT JOIN t_user t3 on t1.company_id =t3.id
+ LEFT JOIN t_user t3 on t1.user_id =t3.id
LEFT JOIN t_port t4 on t1.`port` = t4.id
LEFT JOIN t_group t5 on t3.group_id = t5.id
- where t1.user_id = #{companyId} and t1.status !=0
+ where t1.user_id = #{companyId} and t1.status !=17 and t1.status !=0
<if test="sTime !=null">
and (t1.shipment_date between #{sTime} and #{eTime} or t1.delivery_date between #{sTime} and #{eTime})
</if>
@@ -210,6 +210,7 @@
</if>
GROUP BY
t1.id
+ order by t1.create_time desc
</select>
@@ -220,7 +221,7 @@
</if>
</select>
<select id="getNoPayOrder" resultType="com.stylefeng.guns.modular.system.model.TOrder">
- select * from t_order where user_id =#{userId} and allTotal > paid and status !=17
+ select * from t_order where user_id =#{userId} and allTotal > paid and status !=17 and pay_time is null
</select>
<select id="getLonLat" resultType="java.util.Map">
--
Gitblit v1.7.1