From df95de82e66be5580c0c66d35a6da7f3f180eac1 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 1 Jul 2019 11:03:12 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=89=93=E5=8D=B0=E9=A5=BF=E7=99=BE?=
 =?UTF-8?q?=E5=8F=96=E8=B4=A7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/jxutils.go                     | 8 ++++++++
 business/partner/printer/feie/feie.go           | 9 +++++++--
 business/partner/printer/xiaowm/xiaowm.go       | 6 ++++++
 business/partner/printer/yilianyun/yilianyun.go | 6 ++++++
 business/partner/printer/zhongwu/zhongwu.go     | 6 ++++++
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 47d88e8ce..c37d700a7 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -627,3 +627,11 @@ func OperationTimeStr4VendorStore(v *model.VendorStoreSnapshot) (str string) {
 	}
 	return str
 }
+
+// 得到饿百订单的取货码
+func GetEbaiOrderGetCode(order *model.GoodsOrder) (getCode string) {
+	if order.VendorID == model.VendorIDEBAI && len(order.VendorOrderID2) >= 4 {
+		getCode = order.VendorOrderID2[len(order.VendorOrderID2)-4:]
+	}
+	return getCode
+}
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 1fe7cfd55..fe869dbc0 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -32,6 +32,10 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	if utils.IsTimeZero(expectedDeliveryTime) {
 		expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
 	}
+	getCode := ""
+	if order.VendorID == model.VendorIDEBAI {
+		getCode = fmt.Sprintf("<B>%s</B>\n", jxutils.GetEbaiOrderGetCode(order))
+	}
 	orderFmt := `
 <CB>%s</CB><BR><BR>
 <C>手机买菜上京西</C><BR>
@@ -43,8 +47,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <BR>
 
 <B>%s#%d</B><BR><BR>
-<QR>%s</QR>
-<BR>
+<QR>%s</QR><BR>
+%s
 客户: %s<BR>
 电话: %s<BR>
 地址: %s<BR>
@@ -63,6 +67,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
+		getCode,
 		jxutils.GetVendorName(order.VendorID),
 		order.OrderSeq,
 		order.VendorOrderID,
diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go
index 06c7c71c2..43c7903cf 100644
--- a/business/partner/printer/xiaowm/xiaowm.go
+++ b/business/partner/printer/xiaowm/xiaowm.go
@@ -33,6 +33,10 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	if utils.IsTimeZero(expectedDeliveryTime) {
 		expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
 	}
+	getCode := ""
+	if order.VendorID == model.VendorIDEBAI {
+		getCode = fmt.Sprintf("<big>%s*\n", jxutils.GetEbaiOrderGetCode(order))
+	}
 	orderFmt := `
 <big>    %s**
          手机买菜上京西*
@@ -44,6 +48,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 *
 <big>%s\#%d**
 <qrcA4>%s*
+%s
 客户: %s*
 电话: %s*
 地址: %s*
@@ -62,6 +67,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
+		getCode,
 		jxutils.GetVendorName(order.VendorID),
 		order.OrderSeq,
 		order.VendorOrderID,
diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index 17d76ecf5..e65819749 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -32,6 +32,10 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	if utils.IsTimeZero(expectedDeliveryTime) {
 		expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
 	}
+	getCode := ""
+	if order.VendorID == model.VendorIDEBAI {
+		getCode = fmt.Sprintf("<FS2>%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order))
+	}
 	orderFmt := `
 <FS2><center>%s</center></FS2>\n\n
 <center>手机买菜上京西</center>
@@ -43,6 +47,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 \n
 <FS2>%s#%d</FS2>\n\n
 <QR>%s</QR>
+%s
 \n
 客户: %s\n
 电话: %s\n
@@ -61,6 +66,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
+		getCode,
 		jxutils.GetVendorName(order.VendorID),
 		order.OrderSeq,
 		order.VendorOrderID,
diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go
index 4558bcbaa..5dd6409f5 100644
--- a/business/partner/printer/zhongwu/zhongwu.go
+++ b/business/partner/printer/zhongwu/zhongwu.go
@@ -33,6 +33,10 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	if utils.IsTimeZero(expectedDeliveryTime) {
 		expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
 	}
+	getCode := ""
+	if order.VendorID == model.VendorIDEBAI {
+		getCode = fmt.Sprintf("<S2>%s</S2><RN>", jxutils.GetEbaiOrderGetCode(order))
+	}
 	orderFmt := `
 <S2><C>%s</C></S2><RN><RN>
 <C>手机买菜上京西</C>
@@ -44,6 +48,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <RN>
 <S2>%s#%d</S2><RN><RN>
 <QR>%s</QR>
+%s
 <RN>
 客户: %s<RN>
 电话: %s<RN>
@@ -62,6 +67,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
+		getCode,
 		jxutils.GetVendorName(order.VendorID),
 		order.OrderSeq,
 		order.VendorOrderID,