diff --git a/business/dao/print_temp_utils.go b/business/dao/print_temp_utils.go
index 497b72cf5..e41c00214 100644
--- a/business/dao/print_temp_utils.go
+++ b/business/dao/print_temp_utils.go
@@ -184,10 +184,8 @@ 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]
printValue = append(printValue, param[v])
- //}
default:
printMsg += userTempMap[v]
printValue = append(printValue, param[v])
@@ -254,17 +252,16 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
textMsg string // 文本信息
err error
)
- // 称谓设置/平台语音设置
- if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
- // 老板
- printVoiceMsg += `%d`
- printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
- }
-
// 订单状态
switch param[model.OrderStatusPrint] {
// 新订单
case utils.Int2Str(model.OrderStatusNew):
+ // 称谓设置/平台语音设置
+ if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
+ // 老板
+ printVoiceMsg += `%d`
+ printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
+ }
// 订单设置
if setting.OrderVoiceSetting.PrintOrder == model.SettingOpen { // 打印订单
textMsg, err = MakePrintMsgOnTemp(param, userId)
@@ -279,6 +276,12 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
// 申请取消
case utils.Int2Str(model.ApplyOrderCancel):
+ // 称谓设置/平台语音设置
+ if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
+ // 老板
+ printVoiceMsg += `%d`
+ printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
+ }
// 订单设置
if setting.OrderVoiceSetting.UserOrderCancel == model.SettingOpen { // 申请取消打印
textMsg, err = MakePrintMsgOnTemp(param, userId)
@@ -293,6 +296,12 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
// 申请退款
case utils.Int2Str(model.ApplyOrderRefund):
+ // 称谓设置/平台语音设置
+ if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
+ // 老板
+ printVoiceMsg += `%d`
+ printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
+ }
// 订单设置
if setting.OrderVoiceSetting.RefundOrder == model.SettingOpen { // 取消打印订单
textMsg, err = MakePrintMsgOnTemp(param, userId)
@@ -309,6 +318,12 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
// 取消打印
case utils.Int2Str(model.OrderStatusCanceled):
+ // 称谓设置/平台语音设置
+ if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
+ // 老板
+ printVoiceMsg += `%d`
+ printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
+ }
// 订单设置
if setting.OrderVoiceSetting.BusinessOrderCancel == model.SettingOpen { // 取消打印订单
textMsg, err = MakePrintMsgOnTemp(param, userId)
@@ -325,6 +340,12 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
case utils.Int2Str(model.OrderStatusAccepted): // 待拣货
+ // 称谓设置/平台语音设置
+ if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
+ // 老板
+ printVoiceMsg += `%d`
+ printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
+ }
if setting.PickingSetting.WaitPickingPrint == model.SettingOpen { // 打印订单
textMsg, err = MakePrintMsgOnTemp(param, userId)
if err != nil {
@@ -337,6 +358,12 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
}
case utils.Int2Str(model.OrderStatusWaitAccepted): // 待接单
+ // 称谓设置/平台语音设置
+ if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
+ // 老板
+ printVoiceMsg += `%d`
+ printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
+ }
if setting.PickingSetting.WaitPickingPrint == model.SettingOpen { // 打印订单
textMsg, err = MakePrintMsgOnTemp(param, userId)
if err != nil {
@@ -349,6 +376,12 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param)
}
case utils.Int2Str(model.OrderStatusRejection): // 拒收
+ // 称谓设置/平台语音设置
+ if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
+ // 老板
+ printVoiceMsg += `%d`
+ printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
+ }
if setting.CustomerVoiceSetting.CustomerRejectionVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen {
// 暂无语音打印
}
@@ -364,6 +397,12 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
}
case utils.Int2Str(model.OrderStatusCustomerService): // 客服退款
+ // 称谓设置/平台语音设置
+ if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen {
+ // 老板
+ printVoiceMsg += `%d`
+ printVoiceValue = append(printVoiceValue, setting.CallNameSetting)
+ }
if setting.CustomerVoiceSetting.CustcareRefundVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen {
printVoiceMsg += `%d`
printVoiceValue = append(printVoiceValue, model.BusinessResponsibilityVoice)
@@ -380,18 +419,6 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
textMsg = strings.Replace(fmt.Sprintf(strings.Replace(rejection, "\n", "", -1), rejectionValue...), "\\n", "\r\n", -1)
}
default:
- rejection := ``
- rejectionValue := make([]interface{}, 0, 0)
-
- rejection += `
暂无此状态打印信息
`
- rejection += `OrderNoPrint:%s
`
- rejection += `VendorNamePrint:%s
`
- rejection += `VendorOrderNoPrint:%s
`
- rejection += `CustcareRefundReasonPrint:%s
`
- rejection += `时间:%s
`
- rejection += `status:%s
`
- rejectionValue = append(rejectionValue, param[model.OrderNoPrint], param[model.VendorNamePrint], param[model.VendorOrderNoPrint], param[model.CustcareRefundReasonPrint], utils.Time2DateStr(time.Now()), param[model.OrderStatusPrint])
- textMsg = rejection
}
voice := strings.Replace(fmt.Sprintf(strings.Replace(printVoiceMsg, "\n", "", -1), printVoiceValue...), "\\n", "\r\n", -1)