From b47fba8d37d311a6d1b723a793b4d4c1cdb6e22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 9 Aug 2022 10:06:23 +0800 Subject: [PATCH] 1 --- business/model/print_temp_utils.go | 51 ++++++++++++++++-------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/business/model/print_temp_utils.go b/business/model/print_temp_utils.go index 4fdb6ae32..c9e5fb0f0 100644 --- a/business/model/print_temp_utils.go +++ b/business/model/print_temp_utils.go @@ -86,7 +86,7 @@ func init() { } // MakePrintMsgOnTemp 将打印数据渲染到模板当中 -func MakePrintMsgOnTemp(param map[string]string, userId string, setting *PrintSettingObj) (string, error) { +func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error) { // 查询用户默认模板,不存在则使用系统默认模板 var userTemp *SystemTemp userTemp, isHave, err := SelectUserDefaultTemp(userId, TempTypeMerchant) @@ -100,11 +100,6 @@ func MakePrintMsgOnTemp(param map[string]string, userId string, setting *PrintSe // 需要打印数据 printMsg := "" printValue := make([]interface{}, 0, 0) - if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == SettingOpen { - printMsg += `%s` - printValue = append(printValue, setting.CallNameSetting) - } - for _, v := range strings.Split(userTemp.TempRank, ",") { switch v { case "skuName", "skuNumber", "skuPrice", "skuAllPrice", "allSkuTypeCount", "allSkuCount": @@ -141,20 +136,30 @@ func MakePrintMsgOnTemp(param map[string]string, userId string, setting *PrintSe return strings.Replace(fmt.Sprintf(strings.Replace(printMsg, "\n", "", -1), printValue...), "\\n", "\r\n", -1), nil } -// -//// MakePrintMsgOnTempVoice 制作平台语音 -//func MakePrintMsgOnTempVoice(setting *PrintSettingObj) string { -// // 关闭平台语音模板 -// if setting.SystemVoice == SettingClose { -// return "" -// } -// -// printMsg := "" -// printValue := make([]interface{}, 0, 0) -// if setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66 { -// // 老板 -// printMsg += `%s` -// printValue = append(printValue, setting.CallNameSetting) -// } -// -//} +// MakePrintMsgOnTempVoice 制作平台语音 +func MakePrintMsgOnTempVoice(param map[string]string, setting *PrintSettingObj) string { + printVoiceMsg := "" + printVoiceValue := make([]interface{}, 0, 0) + // 称谓设置/平台语音设置 + if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == SettingClose { + // 老板 + printVoiceMsg += `%s` + printVoiceValue = append(printVoiceValue, setting.CallNameSetting) + } + + // 打印机提示音设置(暂时不做) + + switch param["orderStatus"] { + case "5": // 新订单 + case "10": // 待拣货 + case "110": // 送达 + case "120": // 收货 + + } + + // 订单设置 + if setting.OrderVoiceSetting.PrintOrder == SettingOpen { // 打印订单 + + } + +}