From 6c77f3de1587b0cf6e79e5b990be1318a57a31c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 18 Jun 2020 11:22:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E4=B8=8D=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/printer/feie/feie.go           | 10 ++++++----
 business/partner/printer/xiaowm/xiaowm.go       | 10 ++++++----
 business/partner/printer/yilianyun/yilianyun.go | 11 +++++++----
 business/partner/printer/zhongwu/zhongwu.go     | 10 ++++++----
 business/partner/purchase/jdshop/order.go       |  4 ++--
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 95df6cd28..0ec31b271 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -59,7 +59,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 
 <BR>
 商品明细: <BR>
-品名    数量    单价       小计<BR>
+品名    数量  <BR>
 --------------------------------<BR>`
 		// <BOLD>实际支付:</BOLD>%s<BR>
 	orderParams := []interface{}{
@@ -80,7 +80,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	for _, sku := range order.Skus {
 		orderFmt += `%s<BR>`
 		orderFmt += `%8s%10s%10s<BR>`
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+		//jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
 	}
 	orderFmt += `<BR>
 <BOLD>共%d种%d件商品</BOLD>
@@ -133,7 +134,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 
 <BR>
 <B>商品明细: <BR></B>
-<B>品名数量单价小计<BR></B>
+<B>品名 数量<BR></B>
 --------------------------------<BR>`
 		// <B><BOLD>实际支付:</BOLD></B><B>%s<BR></B>
 	orderParams := []interface{}{
@@ -154,7 +155,8 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	for _, sku := range order.Skus {
 		orderFmt += `<B>%s<BR></B>`
 		orderFmt += `<B>%s %s %s<BR><BR></B>`
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+		//jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
 	}
 	orderFmt += `<BR>
 <B><BOLD>共%d种%d件商品</BOLD></B>
diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go
index 036ae90ed..5b9be1c2b 100644
--- a/business/partner/printer/xiaowm/xiaowm.go
+++ b/business/partner/printer/xiaowm/xiaowm.go
@@ -60,7 +60,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 客户备注: *
 <big>%s*
 商品明细: *
-品名   数量    单价         小计
+品名   数量   
 --------------------------------*
 `
 		// <S011>实际支付: %s*
@@ -81,7 +81,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	for _, sku := range order.Skus {
 		orderFmt += `%s*`
 		orderFmt += `%8s%10s%10s*`
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+		// jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
 	}
 	orderFmt += `
 *
@@ -135,7 +136,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 <big>客户备注: *
 <big>%s*
 <big>商品明细: *
-<big>品名数量单价小计*
+<big>品名 数量*
 --------------------------------*
 `
 		// <big>实际支付: %s*
@@ -156,7 +157,8 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	for _, sku := range order.Skus {
 		orderFmt += `<big>%s*`
 		orderFmt += `<big>%s %s %s*`
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+		// jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
 	}
 	orderFmt += `
 <big>共%d种%d件商品*
diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index f9036496f..a58b93767 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -36,6 +36,7 @@ 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))
 	}
+	//TODO 去掉单价和小计，2020-06-18
 	orderFmt := `
 <FS2><center>%s</center></FS2>\n\n
 <center>手机买菜上京西</center>
@@ -57,7 +58,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 \n
 \n
 商品明细: \n
-品名    数量    单价       小计\n
+品名    数量 \n
 --------------------------------\n`
 	// <FB>实际支付:</FB>%s\n
 	orderParams := []interface{}{
@@ -78,7 +79,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	for _, sku := range order.Skus {
 		orderFmt += `%s\n`
 		orderFmt += `%8s%10s%10s\n`
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+		//jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
 	}
 	orderFmt += `\n
 <FB>共%d种%d件商品</FB>
@@ -125,7 +127,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 \n
 \n
 <FS2>商品明细: \n</FS2>
-<FS2>品名数量单价小计\n</FS2>
+<FS2>品名 数量\n</FS2>
 --------------------------------\n`
 	// <FS2><FB>实际支付:</FB>%s\n</FS2>
 	orderParams := []interface{}{
@@ -146,7 +148,8 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	for _, sku := range order.Skus {
 		orderFmt += `<FS2>%s\n</FS2>`
 		orderFmt += `<FS2>%s %s %s\n\n</FS2>`
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+		//jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
 	}
 	orderFmt += `\n
 <FS2><FB>共%d种%d件商品</FB></FS2>
diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go
index 312c8979f..a8ef7a8e4 100644
--- a/business/partner/printer/zhongwu/zhongwu.go
+++ b/business/partner/printer/zhongwu/zhongwu.go
@@ -58,7 +58,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <RN>
 <RN>
 商品明细: <RN>
-品名    数量    单价       小计<RN>
+品名    数量  <RN>
 ********************************<RN>`
 	// <B1>实际支付:</B1>%s<RN>
 	orderParams := []interface{}{
@@ -79,7 +79,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 	for _, sku := range order.Skus {
 		orderFmt += `%s<RN>`
 		orderFmt += `%8s%10s%10s<RN>`
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+		//jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
 	}
 	orderFmt += `<RN>
 <B1>共%d种%d件商品</B1>
@@ -126,7 +127,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 <RN>
 <RN>
 <S2>商品明细: <RN></S2>
-<S2>品名数量单价小计<RN></S2>
+<S2>品名 数量<RN></S2>
 ********************************<RN>`
 	// <S2><B1>实际支付:</B1>%s<RN></S2>
 	orderParams := []interface{}{
@@ -147,7 +148,8 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 	for _, sku := range order.Skus {
 		orderFmt += `<S2>%s<RN></S2>`
 		orderFmt += `<S2>%s %s %s<RN><RN></S2>`
-		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)))
+		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+		//jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))
 	}
 	orderFmt += `<RN>
 <S2><B1>共%d种%d件商品</B1></S2>
diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index 7b37f7363..4b704a438 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -62,9 +62,9 @@ func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 	status, err := p.GetOrderStatus("", order.VendorOrderID2)
 	//说明此时该订单在平台上已经取消了
 	if status == model.OrderStatusApplyCancel {
-		err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成")
-	} else {
 		err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单状态发生了改变")
+	} else {
+		err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成")
 	}
 	return err
 }