From 7a13c37eade6d4cea742c663e3121222d1b6b8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 29 Aug 2022 10:17:21 +0800
Subject: [PATCH] 1

---
 business/dao/print_temp_utils.go | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/business/dao/print_temp_utils.go b/business/dao/print_temp_utils.go
index 291e1ffef..cec905dec 100644
--- a/business/dao/print_temp_utils.go
+++ b/business/dao/print_temp_utils.go
@@ -184,10 +184,10 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error)
 		case "title":
 			printMsg += userTempMap[v]
 		case "qrcOrder":
-			if param["vendorId"] == utils.Int2Str(model.VendorIDEBAI) && param[v] != "" { // 饿百订单
-				printMsg += userTempMap[v]
-				printMsg += param[v]
-			}
+			//if param["vendorId"] == utils.Int2Str(model.VendorIDEBAI) && param[v] != "" { // 饿百订单
+			printMsg += userTempMap[v]
+			printMsg += param[v]
+			//}
 		default:
 			printMsg += userTempMap[v]
 			printValue = append(printValue, param[v])
@@ -384,8 +384,13 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
 		rejectionValue := make([]interface{}, 0, 0)
 
 		rejection += `<center><b>暂无此状态打印信息</b></center><br>`
-		rejection += `<center><b>%s</b></center><br>`
-		rejectionValue = append(rejectionValue, param[model.OrderNoPrint], param[model.VendorNamePrint], param[model.VendorOrderNoPrint], param[model.CustcareRefundReasonPrint], utils.Time2DateStr(time.Now()))
+		rejection += `<center><b>OrderNoPrint:%s</b></center><br>`
+		rejection += `<center><b>VendorNamePrint:%s</b></center><br>`
+		rejection += `<center><b>VendorOrderNoPrint:%s</b></center><br>`
+		rejection += `<center><b>CustcareRefundReasonPrint:%s</b></center><br>`
+		rejection += `<center><b>时间:%s</b></center><br>`
+		rejection += `<center><b>status:%s</b></center><br>`
+		rejectionValue = append(rejectionValue, param[model.OrderNoPrint], param[model.VendorNamePrint], param[model.VendorOrderNoPrint], param[model.CustcareRefundReasonPrint], utils.Time2DateStr(time.Now()), param[model.OrderStatusPrint])
 		textMsg = rejection
 	}