diff --git a/business/dao/print_temp_utils.go b/business/dao/print_temp_utils.go index fc513e2fc..922c39495 100644 --- a/business/dao/print_temp_utils.go +++ b/business/dao/print_temp_utils.go @@ -150,7 +150,7 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error) for _, v := range strings.Split(userTemp.TempRank, ",") { switch v { - case "skuName", "skuNumber", "skuPrice", "skuAllPrice", "allSkuTypeCount", "allSkuCount": + case "skuName", "skuNumber", "skuPrice", "skuAllPrice", "allSkuTypeCount", "allSkuCount", "upc": continue case "goodsListDetail": printMsg += model.TempTag[v] @@ -165,9 +165,9 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error) printMsg += userTempMap["skuNumber"] printMsg += userTempMap["skuPrice"] printMsg += userTempMap["skuAllPrice"] - printValue = append(printValue, skuList[i].SkuName, skuList[i].SkuName, skuList[i].SalePrice, skuList[i].TotalCountPrice) + printValue = append(printValue, skuList[i].SkuName, skuList[i].SkuCount, skuList[i].SalePrice, skuList[i].TotalCountPrice) if skuList[i].Upc != "" { - printMsg += model.TempTag["sku"] + printMsg += userTempMap["skuUpc"] printValue = append(printValue, skuList[i].Upc) } @@ -179,6 +179,15 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error) case "divider": printMsg += userTempMap["divider"] printValue = append(printValue, param[v]) + case "storeName": + printMsg += userTempMap["storeName"] + printValue = append(printValue, param[v]) + case "storeTel": + printMsg += userTempMap["storeTel"] + printValue = append(printValue, param[v]) + case "officialName": + printMsg += userTempMap["officialName"] + printValue = append(printValue, param[v]) default: printMsg += userTempMap[v] printValue = append(printValue, param[v]) @@ -248,7 +257,7 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj, // 称谓设置/平台语音设置 if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen { // 老板 - printVoiceMsg += `%s` + printVoiceMsg += `%d` printVoiceValue = append(printVoiceValue, setting.CallNameSetting) }