From 9eb51d0748c9ec1e19182e2e3b14a5bd128e2d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 2 Dec 2020 10:01:52 +0800
Subject: [PATCH] haocaixians

---
 business/jxcallback/orderman/order.go         |  1 +
 business/partner/printer/feie/feie.go         | 22 ++++++++++++++-----
 .../partner/printer/yilianyun/yilianyun.go    | 22 ++++++++++++++-----
 business/partner/printer/zhongwu/zhongwu.go   | 22 ++++++++++++++-----
 conf/app.conf                                 |  1 +
 globals/globals.go                            |  8 ++++---
 6 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index b81717abb..cf4fcb872 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1260,6 +1260,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 			DeliveryType:     model.OrderDeliveryTypeStoreSelf,
 			StatusTime:       utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
 			OrderSeq:         0,
+			VendorOrgCode:    "1",
 		}
 		//获取真实手机号
 		fakeMobile, err := api.JdShopAPI.PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey)
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 2692bb22a..8d9dcf7c6 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -32,10 +32,16 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	if utils.IsTimeZero(expectedDeliveryTime) {
 		expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
 	}
+	orderParams := []interface{}{}
 	getCode := ""
 	if order.VendorID == model.VendorIDEBAI {
 		getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order))
 	}
+	if order.VendorOrgCode == "34665" {
+		orderParams = append(orderParams, globals.StoreNameEbai2)
+	} else {
+		orderParams = append(orderParams, globals.StoreName)
+	}
 	orderFmt := `
 <CB>%s</CB><BR><BR>
 <C>手机买菜上京西</C><BR>
@@ -62,8 +68,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 品名    数量    单价       小计<BR>
 --------------------------------<BR>`
 		// <BOLD>实际支付:</BOLD>%s<BR>
-	orderParams := []interface{}{
-		globals.StoreName,
+	orderParams = append(orderParams,
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
@@ -75,7 +80,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		order.ConsigneeAddress,
 		order.BuyerComment,
 		// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
-	}
+	)
 
 	for _, sku := range order.Skus {
 		orderFmt += `%s<BR>`
@@ -110,6 +115,12 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	if order.VendorID == model.VendorIDEBAI {
 		getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order))
 	}
+	orderParams := []interface{}{}
+	if order.VendorOrgCode == "34665" {
+		orderParams = append(orderParams, globals.StoreNameEbai2)
+	} else {
+		orderParams = append(orderParams, globals.StoreName)
+	}
 	orderFmt := `
 <CB>%s</CB><BR><BR>
 <C>手机买菜上京西</C><BR>
@@ -136,8 +147,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 <B>品名数量单价小计<BR></B>
 --------------------------------<BR>`
 		// <B><BOLD>实际支付:</BOLD></B><B>%s<BR></B>
-	orderParams := []interface{}{
-		globals.StoreName,
+	orderParams = append(orderParams,
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
@@ -149,7 +159,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 		order.ConsigneeAddress,
 		order.BuyerComment,
 		// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
-	}
+	)
 
 	for _, sku := range order.Skus {
 		orderFmt += `<B>%s<BR></B>`
diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index 6b1ac7f59..1f4a4cfc9 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -36,6 +36,12 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	if order.VendorID == model.VendorIDEBAI {
 		getCode = fmt.Sprintf("<FS2>饿百取货码:%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order))
 	}
+	orderParams := []interface{}{}
+	if order.VendorOrgCode == "34665" {
+		orderParams = append(orderParams, globals.StoreNameEbai2)
+	} else {
+		orderParams = append(orderParams, globals.StoreName)
+	}
 	//TODO 去掉单价和小计，2020-06-18
 	orderFmt := `
 <FS2><center>%s</center></FS2>\n\n
@@ -61,8 +67,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 品名    数量    单价       小计\n
 --------------------------------\n`
 	// <FB>实际支付:</FB>%s\n
-	orderParams := []interface{}{
-		globals.StoreName,
+	orderParams = append(orderParams,
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
@@ -74,7 +79,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		order.ConsigneeAddress,
 		order.BuyerComment,
 		// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
-	}
+	)
 
 	for _, sku := range order.Skus {
 		orderFmt += `%s\n`
@@ -105,6 +110,12 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	if order.VendorID == model.VendorIDEBAI {
 		getCode = fmt.Sprintf("<FS2>饿百取货码:%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order))
 	}
+	orderParams := []interface{}{}
+	if order.VendorOrgCode == "34665" {
+		orderParams = append(orderParams, globals.StoreNameEbai2)
+	} else {
+		orderParams = append(orderParams, globals.StoreName)
+	}
 	orderFmt := `
 <FS2><center>%s</center></FS2>\n\n
 <center>手机买菜上京西</center>
@@ -129,8 +140,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 <FS2>品名数量单价小计\n</FS2>
 --------------------------------\n`
 	// <FS2><FB>实际支付:</FB>%s\n</FS2>
-	orderParams := []interface{}{
-		globals.StoreName,
+	orderParams = append(orderParams,
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
@@ -142,7 +152,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 		order.ConsigneeAddress,
 		order.BuyerComment,
 		// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
-	}
+	)
 
 	for _, sku := range order.Skus {
 		orderFmt += `<FS2>%s\n</FS2>`
diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go
index 9eff3d4e1..bd48807ab 100644
--- a/business/partner/printer/zhongwu/zhongwu.go
+++ b/business/partner/printer/zhongwu/zhongwu.go
@@ -37,6 +37,12 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	if order.VendorID == model.VendorIDEBAI {
 		getCode = fmt.Sprintf("<S2>饿百取货码:%s</S2><RN>\n", jxutils.GetEbaiOrderGetCode(order))
 	}
+	orderParams := []interface{}{}
+	if order.VendorOrgCode == "34665" {
+		orderParams = append(orderParams, globals.StoreNameEbai2)
+	} else {
+		orderParams = append(orderParams, globals.StoreName)
+	}
 	orderFmt := `
 <S2><C>%s</C></S2><RN><RN>
 <C>手机买菜上京西</C>
@@ -61,8 +67,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 品名    数量  <RN>
 ********************************<RN>`
 	// <B1>实际支付:</B1>%s<RN>
-	orderParams := []interface{}{
-		globals.StoreName,
+	orderParams = append(orderParams,
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
@@ -74,7 +79,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		order.ConsigneeAddress,
 		order.BuyerComment,
 		// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
-	}
+	)
 
 	for _, sku := range order.Skus {
 		orderFmt += `%s<RN>`
@@ -106,6 +111,12 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	if order.VendorID == model.VendorIDEBAI {
 		getCode = fmt.Sprintf("<S2>饿百取货码:%s</S2><RN>\n", jxutils.GetEbaiOrderGetCode(order))
 	}
+	orderParams := []interface{}{}
+	if order.VendorOrgCode == "34665" {
+		orderParams = append(orderParams, globals.StoreNameEbai2)
+	} else {
+		orderParams = append(orderParams, globals.StoreName)
+	}
 	orderFmt := `
 <S2><C>%s</C></S2><RN><RN>
 <C>手机买菜上京西</C>
@@ -130,8 +141,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 <S2>品名 数量<RN></S2>
 ********************************<RN>`
 	// <S2><B1>实际支付:</B1>%s<RN></S2>
-	orderParams := []interface{}{
-		globals.StoreName,
+	orderParams = append(orderParams,
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
@@ -143,7 +153,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 		order.ConsigneeAddress,
 		order.BuyerComment,
 		// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
-	}
+	)
 
 	for _, sku := range order.Skus {
 		orderFmt += `<S2>%s<RN></S2>`
diff --git a/conf/app.conf b/conf/app.conf
index 6b1f39cd2..efaadf5c5 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -123,6 +123,7 @@ getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f"
 storeName = "京西菜市"
 storeNameMtwm = "京西菜市"
 storeNameEbai = "饿鲜达"
+storeNameEbai2 = "好菜鲜生"
 
 smsSignName = "京西菜市"
 smsMobileVerifyTemplate = "SMS_175583158"
diff --git a/globals/globals.go b/globals/globals.go
index df52f970b..fa68b2394 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -41,9 +41,10 @@ var (
 	GetPushTokenURL    string
 	GetWeimobTokenURL  string
 
-	StoreName     string
-	StoreNameMtwm string
-	StoreNameEbai string
+	StoreName      string
+	StoreNameMtwm  string
+	StoreNameEbai  string
+	StoreNameEbai2 string
 
 	SMSSignName              string
 	SMSMobileVerifyTemplate  string
@@ -118,6 +119,7 @@ func Init() {
 	StoreName = beego.AppConfig.String("storeName")
 	StoreNameMtwm = beego.AppConfig.String("storeNameMtwm")
 	StoreNameEbai = beego.AppConfig.String("storeNameEbai")
+	StoreNameEbai2 = beego.AppConfig.String("storeNameEbai2")
 
 	SMSSignName = beego.AppConfig.String("smsSignName")
 	SMSMobileVerifyTemplate = beego.AppConfig.String("smsMobileVerifyTemplate")