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("%s\n", jxutils.GetEbaiOrderGetCode(order))
+ }
orderFmt := `
%s
手机买菜上京西
@@ -43,8 +47,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
%s#%d
-%s
-
+%s
+%s
客户: %s
电话: %s
地址: %s
@@ -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("%s*\n", jxutils.GetEbaiOrderGetCode(order))
+ }
orderFmt := `
%s**
手机买菜上京西*
@@ -44,6 +48,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
*
%s\#%d**
%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("%s\\n\n", jxutils.GetEbaiOrderGetCode(order))
+ }
orderFmt := `
%s\n\n
手机买菜上京西
@@ -43,6 +47,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
\n
%s#%d\n\n
%s
+%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("%s", jxutils.GetEbaiOrderGetCode(order))
+ }
orderFmt := `
%s
手机买菜上京西
@@ -44,6 +48,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
%s#%d
%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,