diff --git a/business/dao/print_temp_utils.go b/business/dao/print_temp_utils.go index 6d4b4f83b..5f1ac9719 100644 --- a/business/dao/print_temp_utils.go +++ b/business/dao/print_temp_utils.go @@ -255,25 +255,24 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj, textMsg string // 文本信息 err error ) - globals.SugarLogger.Debug("==================param", param) // 订单状态 switch param[model.OrderStatusPrint] { - // 新订单 + // 新订单(待接单) case utils.Int2Str(model.OrderStatusNew): // 称谓设置/平台语音设置 - if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen { + if setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66 { // 老板 printVoiceMsg += `%d` printVoiceValue = append(printVoiceValue, setting.CallNameSetting) } // 订单设置 - if setting.OrderVoiceSetting.PrintOrder == model.SettingOpen { // 打印订单 + if setting.PrintSetting.WaitOrderPrint == model.SettingOpen { // 打印订单 textMsg, err = MakePrintMsgOnTemp(param, userId) if err != nil { return "", err } } - if setting.OrderVoiceSetting.OrderNotice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 订单通知 + if setting.VoiceSetting.WaitOrderVoice == model.SettingOpen { // 订单通知 printVoiceMsg += `%d` // 你来新订单了 printVoiceValue = append(printVoiceValue, model.NewOrderVoice) printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param) diff --git a/business/model/print_setting.go b/business/model/print_setting.go index 5d0b3ef84..91770e77f 100644 --- a/business/model/print_setting.go +++ b/business/model/print_setting.go @@ -36,6 +36,7 @@ type PrintSettingObj struct { DeletedAt time.Time `json:"deleted_at" db:"deleted_at"` PrintNo string `json:"print_no" db:"print_no"` // 打印机编号 CallNameSetting int `json:"call_name_setting" db:"call_name_setting"` // 称谓设置 [64-默认老板] + BusinessOffLineVoice int `json:"business_off_line_voice" db:"business_off_line_voice"` // 店铺离线语音[1打开] BalanceNotEnoughVoice int `json:"balance_not_enough_voice" db:"balance_not_enough_voice"` // 余额不足语音提示[1打开] EveryDayGreetVoice int `json:"every_day_greet_voice" db:"every_day_greet_voice"` // 每日招呼语音[1打开]