From 0d43d9cadc5aa8b567f492a4d80dc2af7a3e185b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 26 Jul 2024 18:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/smssalesbill/SmsSalesBillMapper.xml   | 89 ++++++++++---------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml
index a024b80..659c9b4 100644
--- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml
+++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml
@@ -37,51 +37,52 @@
 	</select>
     <select id="reviewListPage" resultType="com.yxt.sales.biz.smssalesbill.OrderReviewVo">
 		SELECT
-			s.sid,
-			s.billState,
-			s.noticeState,
-			( SELECT IFNULL( SUM( count ), 0 ) FROM sms_sales_bill_detail AS d WHERE d.billSid = s.sid ) goodsTotalCount,
-			CONCAT( p.remarks, '/', s.remarks ) remarksOnlineSys,
-			p.buyerMessage,
-			s.warehouseName,
-			l.deliveryTypeValue,
-			l.logisticsName,
-			l.logisticsCost,
-			sp.buyserID,
-			CONCAT( p.shipperName, p.shipperMob, p.deliveryProvince, p.deliveryCity, p.deliveryCounty, p.deliveryAddress ) deliveryAddress,
-			a.realPay,
-			a.discountAmount,
-			a.dueAmount,
-			a.freight,
-			a.serviceAmount,
-			a.declaredValue,
-			l.volume,
-			l.weight,
-			s.billNo,
-			s.billNo AS sysBillNo,
-			sp.shopName,
-			l.billCreateTime,
-			l.payTime,
-			l.expectSendDate,
-			l.deliveryDate,
-			l.latestReceivingTime,
-			l.latestSendTime,
-			l.latestArriveTime,
-			l.needPushTime,
-			s.salesName,
-			i.invoiceTitle,
-			sp.buyserID AS talentID,
-			sp.buyserNickname,
-			sp.agentShop,
-			sp.originalPlat,
-			sp.originalBillNo
+		s.sid,
+		s.billState,
+		s.noticeState,
+		( SELECT IFNULL( SUM( count ), 0 ) FROM sms_sales_bill_detail AS d WHERE d.billSid = s.sid ) goodsTotalCount,
+		CONCAT(IFNULL(p.remarks,''),'/', IFNULL(s.remarks,'')) remarksOnlineSys,
+		p.buyerMessage,
+		s.warehouseName,
+		l.deliveryTypeValue,
+		l.logisticsName,
+		l.logisticsCost,
+		sp.buyserID,
+		CONCAT( IFNULL(p.shipperName,''), IFNULL(p.shipperMob,''), IFNULL(p.deliveryProvince,''), IFNULL(p.deliveryCity,''),
+		IFNULL(p.deliveryCounty,''), IFNULL(p.deliveryAddress ,'')) as deliveryAddress,
+		a.realPay,
+		a.discountAmount,
+		a.dueAmount,
+		a.freight,
+		a.serviceAmount,
+		a.declaredValue,
+		l.volume,
+		l.weight,
+		s.billNo,
+		s.billNo AS sysBillNo,
+		sp.shopName,
+		l.billCreateTime,
+		l.payTime,
+		l.expectSendDate,
+		l.deliveryDate,
+		l.latestReceivingTime,
+		l.latestSendTime,
+		l.latestArriveTime,
+		l.needPushTime,
+		s.salesName,
+		i.invoiceTitle,
+		sp.buyserID AS talentID,
+		sp.buyserNickname,
+		sp.agentShop,
+		sp.originalPlat,
+		sp.originalBillNo
 		FROM
-			sms_sales_bill AS s
-				LEFT JOIN sms_sales_billshipper AS p ON p.billSid = s.sid
-				LEFT JOIN sms_sales_bill_logistics AS l ON l.billSid = s.sid
-				LEFT JOIN sms_sales_bill_shop AS sp ON sp.billSid = s.sid
-				LEFT JOIN sms_sales_bill_amount AS a ON a.billSid = s.sid
-				LEFT JOIN sms_sales_bill_invoice AS i ON i.billSid = s.sid
+		sms_sales_bill AS s
+		LEFT JOIN sms_sales_billshipper AS p ON p.billSid = s.sid
+		LEFT JOIN sms_sales_bill_logistics AS l ON l.billSid = s.sid
+		LEFT JOIN sms_sales_bill_shop AS sp ON sp.billSid = s.sid
+		LEFT JOIN sms_sales_bill_amount AS a ON a.billSid = s.sid
+		LEFT JOIN sms_sales_bill_invoice AS i ON i.billSid = s.sid
 		<where>
 			${ew.sqlSegment}
 		</where>