From 30ef1b358849658a0bbafd8bbed6d1ec2391be9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 9 Aug 2022 11:56:34 +0800
Subject: [PATCH] 1

---
 business/model/print_temp_utils.go |  8 +++-
 business/model/print_temp_voice.go | 76 +++++++++++++++---------------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/business/model/print_temp_utils.go b/business/model/print_temp_utils.go
index 9def9cc92..ccd282e40 100644
--- a/business/model/print_temp_utils.go
+++ b/business/model/print_temp_utils.go
@@ -150,7 +150,7 @@ func MakePrintMsgOnTempVoice(param map[string]string, setting *PrintSettingObj,
 	// 打印机提示音设置(暂时不做)
 
 	textMsg := ""
-	switch param["orderStatus"] {
+	switch param[OrderStatusPrint] {
 	case "3", "5", "10": // 新订单
 		// 订单设置
 		if setting.OrderVoiceSetting.PrintOrder == SettingOpen { // 打印订单
@@ -161,7 +161,11 @@ func MakePrintMsgOnTempVoice(param map[string]string, setting *PrintSettingObj,
 		}
 		if setting.OrderVoiceSetting.OrderNotice == SettingOpen { // 订单通知
 			printVoiceMsg += `<sound>%s</sound>` // 你来新订单了
-			if param[]
+			switch param[VendOrIDPrint] {
+			case :
+
+			}
+
 			printVoiceValue = append(printVoiceValue, NewOrderVoice)
 		}
 
diff --git a/business/model/print_temp_voice.go b/business/model/print_temp_voice.go
index a3cf4aad6..b2ff84e64 100644
--- a/business/model/print_temp_voice.go
+++ b/business/model/print_temp_voice.go
@@ -1,5 +1,6 @@
 package model
 
+// 语音常量
 const (
 	WeComeJXPrintVoice          = 1  //. 欢迎使用京西云打印机.mp3
 	NetConnSuccessVoice         = 2  //. 网络连接成功.mp3
@@ -80,44 +81,41 @@ const (
 	ElementVoice                = 77 //. 元.mp3
 )
 
+// 菜市商城常量名称
 const (
-	Title = `<center>手机买菜上京西</center><br>
-	<center>极速到家送惊喜</center><br>
-	--------------------------------<br>`
-
-	Sound        = `<br><sound>%s</sound><br>`
-	EBailOrderNo = `<center><b>%s</b></center><br><br>`
-	PayOrderTime = ` <b>下单时间: %s</b><br>`
-	TrySendTime  = ` <b>预计送达: %s</b><br>`
-	OrderNo      = ` <b>订单编号: %s</b><br>`
-	BusinessType = `<center><b>预订单</b></center><br>`
-
-	VendorName = `<br><b>%s`
-	EBaiCode   = `#%s</b><br>`
-
-	QRCOrder         = `<qrc>%s</qrc><br>`
-	EBaiVendorName   = `<b>%s:`
-	EBaiOrderNo      = `%s</b><br><br>`
-	ConsigneeName    = ` <b>客户: %s<br>`
-	ConsigneeMobile  = ` <b>电话: %s<br>`
-	ConsigneeAddress = ` <b>地址: %s<br><br>`
-
-	BuyerComment    = ` <b>客户备注:</b><br><b>%s</b><br><br>`
-	GoodsListDetail = `商品明细:<br>
-	品名    数量    单价       小计<br>
-	--------------------------------<br>`
-
-	SkuName     = `<b>%s</b><br>`
-	SkuNumber   = `<b>x%s</b>`
-	SkuPrice    = `     <b>￥%s</b>`
-	SkuAllPrice = `     <b>￥%s</b><br>`
-	SkuUpc      = `upc码： %s\n`
-
-	AllSkuTypeCount = `<br><br><b>共%s种,`
-	AllSkuCount     = `%s件商品</b><br>--------------------------------<br>`
-
-	StoreName = `<center><b>商品质量问题请联系:</b></center><br><center><b>%s:`
-	StoreTel  = `%s</b></center><br><br>更多信息请关注官方微信: `
-
-	OfficialName = "officialName"
+	EBailOrderNoPrint     = "eBaiOrderNo"      // 品牌名称
+	BusinessTypePrint     = "businessType"     // 是否为预定单
+	PayOrderTimePrint     = "payOrderTime"     // 下单时间
+	TrySendTimePrint      = "trySendTime"      // 预计送达时间
+	OrderNoPrint          = "orderNo"          // 订单编号
+	VendorNamePrint       = "vendorName"       // 订单来源平台名称
+	VendOrIDPrint         = "vendOrID"         // 订单来源平台id
+	VendorOrderNoPrint    = "vendorOrderNo"    // 订单序号1/2/
+	EBaiCodePrint         = "eBailCode"        // 饿百取货码
+	QRCOrderPrint         = "qRCOrder"         // 订单二维码单号，还是订单Id
+	ConsigneeNamePrint    = "consigneeName"    // 客户名称
+	ConsigneeMobilePrint  = "consigneeMobile"  // 客户电话
+	ConsigneeAddressPrint = "consigneeAddress" // 客户地址
+	BuyerCommentPrint     = "buyerComment"     // 客户备注
+	SkuListPrint          = "skuList"          // 商品列表
+	SkuNamePrint          = "skuName"          // 商品名称
+	SkuCountPrint         = "skuCount"         // 商品件数
+	SkuOnePricePrint      = "skuOnePrice"      // 商品单价
+	SkuAllPricePrint      = "skuAllPrice"      // 商品总价 = 商品件数 x 商品件数
+	AllSkuTypeCountPrint  = "allSkuTypeCount"  // 商品种类
+	AllSkuCountPrint      = "allSkuCount"      // 商品总数量
+	UserPayMoneyPrint     = "userPayMoney"     // 用户支付
+	StoreNamePrint        = "storeName"        // 门店名称
+	StoreTelPrint         = "storeTel"         // 门店电话
+	OfficialNamePrint     = "officialName"     // 官方名称
+	BigFontPrint          = "bigFont"          // 是否为大字体
+	PrintNumberPrint      = "printNumber"      // 打印次数
+	AppIDPrint            = "appId"            // 应用id
+	OrderStatusPrint      = "orderStatus"      // 订单状态
+	WayBillStatusPrint    = "wayBillStatus"    // 运单状态
 )
+
+// 订单/运单常量
+const ()
+
+// 平台常量