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/TUserMapper.xml |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml b/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
index 75ba511..0d4f8e3 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
+++ b/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
@@ -102,22 +102,20 @@
 	t1.invoice_number invoiceNumber,
 	t1.company_id companyId,
 	t2.NAME companyName,
+	t2.headImg logo,
 	t1.pay_time invoiceDate,
 	tu.company_name sCompanyName,
 	t1.shipment_date pickupDate,
 	t4.NAME portName,
-	t1.s_name sContactName,
-	t1.s_phone sContactPhone,
-	t1.accessorial_str chassisService,
-	t1.delivery_date deliveryDate,
-	t1.e_company_name eCompanyName,
-	t1.e_name eContactName,
-	t1.e_phone eContactPhone
+	t5.address userAddress,
+	t1.type type,
+	t1.delivery_date dueBy
 FROM
 	t_order t1
 	LEFT JOIN t_company t2 ON t1.company_id = t2.id
 	LEFT JOIN t_user tu ON t1.user_id = tu.id
 	LEFT JOIN t_port t4 ON t1.PORT = t4.id
+	left join t_user_address t5 on (t5.user_id=tu.id and t5.is_default =1)
 	where t1.id =#{number}
     </select>
     <select id="getOrderInfoOne" resultType="com.stylefeng.guns.modular.system.model.InvoicesVoOne">
@@ -140,7 +138,8 @@
 	t1.e_phone eContactPhone,
 	t1.paid paid,
 	(t1.allTotal-t1.paid) unPaid,
-	t1.pay_info_state status
+	t1.pay_info_state status,
+	t1.type type
 FROM
 	t_order t1
 	LEFT JOIN t_company t2 ON t1.company_id = t2.id

--
Gitblit v1.7.1