diff --git a/business/dao/print_temp_utils.go b/business/dao/print_temp_utils.go
index 922c39495..fbb905289 100644
--- a/business/dao/print_temp_utils.go
+++ b/business/dao/print_temp_utils.go
@@ -186,7 +186,7 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error)
printMsg += userTempMap["storeTel"]
printValue = append(printValue, param[v])
case "officialName":
- printMsg += userTempMap["officialName"]
+ printMsg += userTempMap[v]
printValue = append(printValue, param[v])
default:
printMsg += userTempMap[v]
@@ -220,14 +220,14 @@ func MakePrintMsgOnTempVoice(param map[string]string, setting *model.PrintSettin
printVoiceMsg := ``
printVoiceValue := make([]interface{}, 0, 0)
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.ReminderOrderVoice)
return strings.Replace(fmt.Sprintf(strings.Replace(printVoiceMsg, "\n", "", -1), printVoiceValue...), "\\n", "\r\n", -1), nil
case utils.Int2Str(model.WaybillStatusDelivered): // 送达
printVoiceMsg := ``
printVoiceValue := make([]interface{}, 0, 0)
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.FinialsOrderVoice)
return strings.Replace(fmt.Sprintf(strings.Replace(printVoiceMsg, "\n", "", -1), printVoiceValue...), "\\n", "\r\n", -1), nil
}
@@ -273,7 +273,7 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
}
if setting.OrderVoiceSetting.OrderNotice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 订单通知
- printVoiceMsg += `%s%s` // 你来新订单了
+ printVoiceMsg += `%d%d` // 你来新订单了
printVoiceValue = append(printVoiceValue, model.NewOrderVoice)
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
}
@@ -287,7 +287,7 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
}
if setting.OrderVoiceSetting.UserOrderCancelVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 申请取消语音
- printVoiceMsg += `%s%s` // 你来新订单了
+ printVoiceMsg += `%d%d` // 你来新订单了
printVoiceValue = append(printVoiceValue, model.ApplyCancelVoice)
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
}
@@ -303,7 +303,7 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
if setting.OrderVoiceSetting.RefundOrderVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen {
if setting.OrderVoiceSetting.OrderNotice == model.SettingOpen && setting.SystemVoice == model.SettingOpen {
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.ApplyRefundVoice)
}
}
@@ -319,7 +319,7 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
if setting.OrderVoiceSetting.BusinessOrderCancelVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen {
if setting.OrderVoiceSetting.OrderNotice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 订单取消语音通知
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
- printVoiceMsg += `%s` // 你来新订单了
+ printVoiceMsg += `%d` // 你来新订单了
printVoiceValue = append(printVoiceValue, model.CancelOrderVoice)
}
}
@@ -332,7 +332,7 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
}
if setting.PickingSetting.WaitPickingVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 订单通知
- printVoiceMsg += `%s%s` // 你有订单未拣货
+ printVoiceMsg += `%d%d` // 你有订单未拣货
printVoiceValue = append(printVoiceValue, model.WaitPickUpOrderVoice)
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
}
@@ -344,7 +344,7 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
}
if setting.PickingSetting.WaitPickingVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 订单通知
- printVoiceMsg += `%s%s` // 你有订单未接单(订单未处理)
+ printVoiceMsg += `%d%d` // 你有订单未接单(订单未处理)
printVoiceValue = append(printVoiceValue, model.WaitOrderVoice)
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
}
@@ -365,7 +365,7 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
case utils.Int2Str(model.OrderStatusCustomerService): // 客服退款
if setting.CustomerVoiceSetting.CustcareRefundVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen {
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.BusinessResponsibilityVoice)
}
if setting.CustomerVoiceSetting.CustcareRefundPrint == model.SettingOpen {
@@ -411,7 +411,7 @@ func PrintWayBillOrderStatus(param map[string]string, setting *model.PrintSettin
}
}
if setting.RiderVoiceSetting.RiderTakeOrderVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 骑手接单语音通知
- printVoiceMsg += `%s%s` // 骑手已经接单了
+ printVoiceMsg += `%d%d` // 骑手已经接单了
printVoiceValue = append(printVoiceValue, model.RiderGetOrderVoice)
}
@@ -431,7 +431,7 @@ func PrintStoreStatus(param map[string]string, setting *model.PrintSettingObj) s
switch utils.Str2Int(param[model.StoreStatusPrint]) {
case -9:
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.LoseTokenVoice)
textMsg += `
门店丢失授权通知
`
textMsg += `门店:%s
`
@@ -453,7 +453,7 @@ func PrintStoreStatus(param map[string]string, setting *model.PrintSettingObj) s
}
// 离线打印语音开启
if setting.SystemVoice == model.SettingOpen && setting.PickingSetting.BusinessOffLineVoice == model.SettingOpen {
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.StoreOfflineVoice)
}
voice := strings.Replace(fmt.Sprintf(strings.Replace(printVoiceMsg, "\n", "", -1), printVoiceValue...), "\\n", "\r\n", -1)
@@ -465,7 +465,7 @@ func PrintStoreStatus(param map[string]string, setting *model.PrintSettingObj) s
// SyntheticSpeech 合成语音 (美团xxx号订单)
func SyntheticSpeech(printVoiceMsg string, printVoiceValue []interface{}, param map[string]string) (string, []interface{}) {
- printVoiceMsg += `%s` // 美团
+ printVoiceMsg += `%d` // 美团
switch param[model.VendOrIDPrint] {
case utils.Int2Str(model.VendorIDJD): // 京东
printVoiceValue = append(printVoiceValue, model.JdVoice)
@@ -483,37 +483,37 @@ func SyntheticSpeech(printVoiceMsg string, printVoiceValue []interface{}, param
if param[model.VendorOrderNoPrint] != "" {
switch len(param[model.VendorOrderNoPrint]) {
case 1:
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint]])
case 2:
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][:1]+"0"])
if param[model.VendorOrderNoPrint][1:] != "0" {
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][1:]])
}
case 3:
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][0:1]+"00"])
if param[model.VendorOrderNoPrint][1:2] == "0" && param[model.VendorOrderNoPrint][2:] == "0" {
} else if param[model.VendorOrderNoPrint][1:2] == "0" && param[model.VendorOrderNoPrint][2:] != "0" {
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][1:2]])
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][2:]])
} else if param[model.VendorOrderNoPrint][1:2] != "0" && param[model.VendorOrderNoPrint][2:] == "0" {
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][1:2]+"0"])
} else if param[model.VendorOrderNoPrint][1:2] != "0" && param[model.VendorOrderNoPrint][2:] != "0" {
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][1:2]+"0"])
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][2:]])
}
}
}
- printVoiceMsg += `%s`
+ printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.OrderNoVoice)
return printVoiceMsg, printVoiceValue
}
diff --git a/business/model/print_temp_config.go b/business/model/print_temp_config.go
index ddaaaeea1..8a42f2164 100644
--- a/business/model/print_temp_config.go
+++ b/business/model/print_temp_config.go
@@ -70,7 +70,7 @@ const (
极速到家送惊喜
--------------------------------
`
- Sound = `
%s
`
+ Sound = `
%d
`
EBailOrderNo = `%s
`
PayOrderTime = ` 下单时间: %s
`
TrySendTime = ` 预计送达: %s
`