From c845eabe693a3a4639b8d548b2e6c8de15e0248b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 11 Aug 2022 14:23:06 +0800 Subject: [PATCH] 1 --- business/auth2/auth2.go | 2 +- business/auth2/authprovider/defauther.go | 2 +- business/authz/autils/authz_utils.go | 2 +- business/{model => }/dao/common.go | 0 business/{model => }/dao/dao.go | 0 business/{model => }/dao/dao_auth2.go | 0 business/{model => }/dao/dao_bz.go | 0 business/{model => }/dao/dao_err.go | 0 business/{model => }/dao/dao_print.go | 0 business/dao/dao_print_setting.go | 25 ++ business/dao/dao_print_temp.go | 29 +++ business/{model => }/dao/dao_user_test.go | 0 business/{model => }/dao/dao_utils.go | 0 business/{model => }/dao/event.go | 0 business/{model => }/dao/new_config.go | 0 business/{model => }/dao/place.go | 0 business/{model => dao}/print_temp_utils.go | 249 ++++++++++---------- business/jxstore/cms/cms.go | 23 +- business/jxstore/cms/message.go | 2 +- business/jxstore/cms/print.go | 2 +- business/jxstore/cms/user2.go | 2 +- business/jxstore/common/common.go | 2 +- business/jxstore/event/event.go | 2 +- business/jxutils/configindb/configindb.go | 2 +- business/jxutils/datares/datares.go | 2 +- business/jxutils/dtask/dtask.go | 2 +- business/jxutils/tasks/configrefresh.go | 2 +- business/model/const.go | 19 ++ business/model/print_setting.go | 23 -- business/model/print_temp.go | 25 -- controllers/api_controller.go | 6 +- main.go | 20 +- 32 files changed, 231 insertions(+), 212 deletions(-) rename business/{model => }/dao/common.go (100%) rename business/{model => }/dao/dao.go (100%) rename business/{model => }/dao/dao_auth2.go (100%) rename business/{model => }/dao/dao_bz.go (100%) rename business/{model => }/dao/dao_err.go (100%) rename business/{model => }/dao/dao_print.go (100%) create mode 100644 business/dao/dao_print_setting.go create mode 100644 business/dao/dao_print_temp.go rename business/{model => }/dao/dao_user_test.go (100%) rename business/{model => }/dao/dao_utils.go (100%) rename business/{model => }/dao/event.go (100%) rename business/{model => }/dao/new_config.go (100%) rename business/{model => }/dao/place.go (100%) rename business/{model => dao}/print_temp_utils.go (51%) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index de4c0d243..19bff002b 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -10,8 +10,8 @@ import ( "time" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/dchest/captcha" diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 510a0c17c..f15f28390 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -9,8 +9,8 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/auth2" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) diff --git a/business/authz/autils/authz_utils.go b/business/authz/autils/authz_utils.go index cb75f0149..2740801be 100644 --- a/business/authz/autils/authz_utils.go +++ b/business/authz/autils/authz_utils.go @@ -6,8 +6,8 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/authz" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" ) func GetRoleDescription(name string, storeID int) (description string) { diff --git a/business/model/dao/common.go b/business/dao/common.go similarity index 100% rename from business/model/dao/common.go rename to business/dao/common.go diff --git a/business/model/dao/dao.go b/business/dao/dao.go similarity index 100% rename from business/model/dao/dao.go rename to business/dao/dao.go diff --git a/business/model/dao/dao_auth2.go b/business/dao/dao_auth2.go similarity index 100% rename from business/model/dao/dao_auth2.go rename to business/dao/dao_auth2.go diff --git a/business/model/dao/dao_bz.go b/business/dao/dao_bz.go similarity index 100% rename from business/model/dao/dao_bz.go rename to business/dao/dao_bz.go diff --git a/business/model/dao/dao_err.go b/business/dao/dao_err.go similarity index 100% rename from business/model/dao/dao_err.go rename to business/dao/dao_err.go diff --git a/business/model/dao/dao_print.go b/business/dao/dao_print.go similarity index 100% rename from business/model/dao/dao_print.go rename to business/dao/dao_print.go diff --git a/business/dao/dao_print_setting.go b/business/dao/dao_print_setting.go new file mode 100644 index 000000000..3c3800e7c --- /dev/null +++ b/business/dao/dao_print_setting.go @@ -0,0 +1,25 @@ +package dao + +import ( + "errors" + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/model" +) + +func GetPrintSetting(printNo string) (*model.PrintSettingObj, error) { + sql := ` SELECT * FROM print_setting WHERE print_no = ? and deleted_at = ? ` + sqlParams := []interface{}{ + printNo, + utils.DefaultTimeValue, + } + + var printSetting *model.PrintSetting + if err := GetRows(GetDB(), &printSetting, sql, sqlParams...); err != nil { + return nil, err + } + if printSetting == nil { + return nil, errors.New("数据查询异常") + } + + return model.UnMarshalString2Json(printSetting) +} diff --git a/business/dao/dao_print_temp.go b/business/dao/dao_print_temp.go new file mode 100644 index 000000000..6e1d3c0e5 --- /dev/null +++ b/business/dao/dao_print_temp.go @@ -0,0 +1,29 @@ +package dao + +import ( + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/model" +) + +// SelectUserDefaultTemp 查询用户默认模板 +func SelectUserDefaultTemp(userId string, tempType string) (*model.SystemTemp, bool, error) { + var result *model.SystemTemp + if err := GetRow(GetDB(), &result, `SELECT * FROM system_temp WHERE user_id = ? AND temp_type = ? AND is_use = ? AND deleted_at = ? ORDER BY created_at desc `, []interface{}{userId, tempType, 1, utils.DefaultTimeValue}...); err != nil { + return nil, false, err + } + return result, true, nil +} + +// QuerySystemTemp 查询系统模板 +func QuerySystemTemp() ([]*model.SystemTemp, error) { + var result []*model.SystemTemp + if err := GetRows(GetDB(), &result, `SELECT * FROM system_temp WHERE user_id = ? ORDER BY created_at desc `, []interface{}{"system_user"}...); err != nil { + return nil, err + } + return result, nil +} + +// AddTemp 添加模板数据 +func AddTemp(param *model.SystemTemp) error { + return CreateEntity(GetDB(), param) +} diff --git a/business/model/dao/dao_user_test.go b/business/dao/dao_user_test.go similarity index 100% rename from business/model/dao/dao_user_test.go rename to business/dao/dao_user_test.go diff --git a/business/model/dao/dao_utils.go b/business/dao/dao_utils.go similarity index 100% rename from business/model/dao/dao_utils.go rename to business/dao/dao_utils.go diff --git a/business/model/dao/event.go b/business/dao/event.go similarity index 100% rename from business/model/dao/event.go rename to business/dao/event.go diff --git a/business/model/dao/new_config.go b/business/dao/new_config.go similarity index 100% rename from business/model/dao/new_config.go rename to business/dao/new_config.go diff --git a/business/model/dao/place.go b/business/dao/place.go similarity index 100% rename from business/model/dao/place.go rename to business/dao/place.go diff --git a/business/model/print_temp_utils.go b/business/dao/print_temp_utils.go similarity index 51% rename from business/model/print_temp_utils.go rename to business/dao/print_temp_utils.go index 861471081..048381894 100644 --- a/business/model/print_temp_utils.go +++ b/business/dao/print_temp_utils.go @@ -1,18 +1,19 @@ -package model +package dao import ( "encoding/json" "fmt" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "strings" "time" ) -var SystemTempObj map[string]*SystemTemp +var SystemTempObj map[string]*model.SystemTemp func init() { - SystemTempObj = make(map[string]*SystemTemp, 0) + SystemTempObj = make(map[string]*model.SystemTemp, 0) sysTempList, err := QuerySystemTemp() if err != nil { globals.SugarLogger.Debug("query system temp err :", err) @@ -23,64 +24,64 @@ func init() { // 不存在系统模板，初始化系统模板 //InitSystemTemp() } - temp := make(map[string]*SystemTemp, 0) + temp := make(map[string]*model.SystemTemp, 0) for _, v := range sysTempList { temp[v.TempSize] = v SystemTempObj[v.TempSize] = v } now := time.Now() - param := &SystemTemp{ + param := &model.SystemTemp{ CreatedAt: &now, UpdatedAt: &now, LastOperator: "system", DeletedAt: &utils.DefaultTimeValue, TempName: "", - TempRank: SystemTempKey, + TempRank: model.SystemTempKey, Temp: "", UserId: "system_user", - TempType: TempTypeMerchant, - TempSize: SystemTempSizeBig, + TempType: model.TempTypeMerchant, + TempSize: model.SystemTempSizeBig, PrintSn: "system", IsUse: 1, } // 初始化大字体模板 - if _, v := temp[SystemTempSizeBig]; !v { - param.TempName = "system" + SystemTempSizeBig - param.Temp = SystemTempValue + if _, v := temp[model.SystemTempSizeBig]; !v { + param.TempName = "system" + model.SystemTempSizeBig + param.Temp = model.SystemTempValue if err := AddTemp(param); err != nil { globals.SugarLogger.Debug("init system temp err :", err) } - SystemTempObj[SystemTempSizeBig] = param + SystemTempObj[model.SystemTempSizeBig] = param } // 初始化中字体模板 - if _, v := temp[SystemTempSizeMedium]; !v { - param.TempName = "system" + SystemTempSizeMedium - medium := strings.Replace(SystemTempValue, "", "", -1) + if _, v := temp[model.SystemTempSizeMedium]; !v { + param.TempName = "system" + model.SystemTempSizeMedium + medium := strings.Replace(model.SystemTempValue, "", "", -1) medium2 := strings.Replace(medium, "", "", -1) param.Temp = medium2 - param.TempSize = SystemTempSizeMedium + param.TempSize = model.SystemTempSizeMedium param.IsUse = 2 if err := AddTemp(param); err != nil { globals.SugarLogger.Debug("init system temp err :", err) } - SystemTempObj[SystemTempSizeMedium] = param + SystemTempObj[model.SystemTempSizeMedium] = param } // 初始化小字体模板 - if _, v := temp[SystemTempSizeSmall]; !v { - param.TempName = "system" + SystemTempSizeSmall - medium := strings.Replace(SystemTempValue, "", " ", -1) + if _, v := temp[model.SystemTempSizeSmall]; !v { + param.TempName = "system" + model.SystemTempSizeSmall + medium := strings.Replace(model.SystemTempValue, "", " ", -1) medium2 := strings.Replace(medium, "", " ", -1) param.Temp = medium2 - param.TempSize = SystemTempSizeSmall + param.TempSize = model.SystemTempSizeSmall param.IsUse = 2 if err := AddTemp(param); err != nil { globals.SugarLogger.Debug("init system temp err :", err) } - SystemTempObj[SystemTempSizeSmall] = param + SystemTempObj[model.SystemTempSizeSmall] = param } } @@ -88,13 +89,13 @@ func init() { // MakePrintMsgOnTemp 将打印数据渲染到模板当中 func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error) { // 查询用户默认模板,不存在则使用系统默认模板 - var userTemp *SystemTemp - userTemp, isHave, err := SelectUserDefaultTemp(userId, TempTypeMerchant) + var userTemp *model.SystemTemp + userTemp, isHave, err := SelectUserDefaultTemp(userId, model.TempTypeMerchant) if err != nil { return "", err } if userTemp == nil || !isHave { - userTemp = SystemTempObj[SystemTempSizeBig] + userTemp = SystemTempObj[model.SystemTempSizeBig] } // 需要打印数据 @@ -105,29 +106,29 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error) case "skuName", "skuNumber", "skuPrice", "skuAllPrice", "allSkuTypeCount", "allSkuCount": continue case "goodsListDetail": - printMsg += TempTag[v] - skuList := make([]*SkuListPrintOrder, 0, 0) + printMsg += model.TempTag[v] + skuList := make([]*model.SkuListPrintOrder, 0, 0) if err := json.Unmarshal([]byte(param[v]), skuList); err != nil { return "", err } for i := 0; i < len(skuList); i++ { - printMsg += TempTag["skuName"] - printMsg += TempTag["skuNumber"] - printMsg += TempTag["skuPrice"] - printMsg += TempTag["skuAllPrice"] + printMsg += model.TempTag["skuName"] + printMsg += model.TempTag["skuNumber"] + printMsg += model.TempTag["skuPrice"] + printMsg += model.TempTag["skuAllPrice"] printValue = append(printValue, skuList[i].SkuName, skuList[i].SkuName, skuList[i].SalePrice, skuList[i].TotalCountPrice) if skuList[i].Upc != "" { - printMsg += TempTag["sku"] + printMsg += model.TempTag["sku"] printValue = append(printValue, skuList[i].Upc) } } case "businessType": if param[v] == "2" { // 是预订单 - printMsg += TempTag[v] + printMsg += model.TempTag[v] } default: - printMsg += TempTag[v] + printMsg += model.TempTag[v] printValue = append(printValue, param[v]) } @@ -137,9 +138,9 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error) } // MakePrintMsgOnTempVoice 制作平台语音 -func MakePrintMsgOnTempVoice(param map[string]string, setting *PrintSettingObj, userId string) (string, error) { +func MakePrintMsgOnTempVoice(param map[string]string, setting *model.PrintSettingObj, userId string) (string, error) { // 打订单 - if param[OrderStatusPrint] != "" { + if param[model.OrderStatusPrint] != "" { // 订单提示设置 printMsg, err := PrinterOrderVoice(param, setting, userId) if err != nil { @@ -149,42 +150,42 @@ func MakePrintMsgOnTempVoice(param map[string]string, setting *PrintSettingObj, } // 打运单 - if param[WayBillStatusPrint] != "" { - switch param[WayBillStatusPrint] { - case utils.Int2Str(WaybillStatusCourierAssigned): // 分配骑手 + if param[model.WayBillStatusPrint] != "" { + switch param[model.WayBillStatusPrint] { + case utils.Int2Str(model.WaybillStatusCourierAssigned): // 分配骑手 return PrintWayBillOrderStatus(param, setting), nil - case utils.Int2Str(WaybillStatusDeliverReminder): // 催单 + case utils.Int2Str(model.WaybillStatusDeliverReminder): // 催单 printVoiceMsg := `` printVoiceValue := make([]interface{}, 0, 0) printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param) printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, ReminderOrderVoice) + printVoiceValue = append(printVoiceValue, model.ReminderOrderVoice) return strings.Replace(fmt.Sprintf(strings.Replace(printVoiceMsg, "\n", "", -1), printVoiceValue...), "\\n", "\r\n", -1), nil - case utils.Int2Str(WaybillStatusDelivered): // 送达 + case utils.Int2Str(model.WaybillStatusDelivered): // 送达 printVoiceMsg := `` printVoiceValue := make([]interface{}, 0, 0) printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param) printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, FinialsOrderVoice) + printVoiceValue = append(printVoiceValue, model.FinialsOrderVoice) return strings.Replace(fmt.Sprintf(strings.Replace(printVoiceMsg, "\n", "", -1), printVoiceValue...), "\\n", "\r\n", -1), nil } } // 门店状态 - if param[StoreStatusPrint] != "" { + if param[model.StoreStatusPrint] != "" { return PrintStoreStatus(param, setting), nil } // 进店咨询 - if param[EnterTheStorePrint] != "" { + if param[model.EnterTheStorePrint] != "" { return `19`, nil } return "", nil } // PrinterOrderVoice 打印机订单提示设置 -func PrinterOrderVoice(param map[string]string, setting *PrintSettingObj, userId string) (string, error) { +func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj, userId string) (string, error) { var ( printVoiceMsg string //语音信息 printVoiceValue = make([]interface{}, 0, 0) @@ -192,120 +193,120 @@ func PrinterOrderVoice(param map[string]string, setting *PrintSettingObj, userId err error ) // 称谓设置/平台语音设置 - if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == SettingOpen { + if (setting.CallNameSetting == 64 || setting.CallNameSetting == 65 || setting.CallNameSetting == 66) && setting.SystemVoice == model.SettingOpen { // 老板 printVoiceMsg += `%s` printVoiceValue = append(printVoiceValue, setting.CallNameSetting) } // 订单状态 - switch param[OrderStatusPrint] { + switch param[model.OrderStatusPrint] { // 新订单 - case utils.Int2Str(OrderStatusNew): + case utils.Int2Str(model.OrderStatusNew): // 订单设置 - if setting.OrderVoiceSetting.PrintOrder == SettingOpen { // 打印订单 + if setting.OrderVoiceSetting.PrintOrder == model.SettingOpen { // 打印订单 textMsg, err = MakePrintMsgOnTemp(param, userId) if err != nil { return "", err } } - if setting.OrderVoiceSetting.OrderNotice == SettingOpen && setting.SystemVoice == SettingOpen { // 订单通知 + if setting.OrderVoiceSetting.OrderNotice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 订单通知 printVoiceMsg += `%s%s` // 你来新订单了 - printVoiceValue = append(printVoiceValue, NewOrderVoice) + printVoiceValue = append(printVoiceValue, model.NewOrderVoice) printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param) } // 申请取消 - case utils.Int2Str(ApplyOrderCancel): + case utils.Int2Str(model.ApplyOrderCancel): // 订单设置 - if setting.OrderVoiceSetting.UserOrderCancel == SettingOpen { // 申请取消打印 + if setting.OrderVoiceSetting.UserOrderCancel == model.SettingOpen { // 申请取消打印 textMsg, err = MakePrintMsgOnTemp(param, userId) if err != nil { return "", err } } - if setting.OrderVoiceSetting.UserOrderCancelVoice == SettingOpen && setting.SystemVoice == SettingOpen { // 申请取消语音 + if setting.OrderVoiceSetting.UserOrderCancelVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 申请取消语音 printVoiceMsg += `%s%s` // 你来新订单了 - printVoiceValue = append(printVoiceValue, ApplyCancelVoice) + printVoiceValue = append(printVoiceValue, model.ApplyCancelVoice) printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param) } // 申请退款 - case utils.Int2Str(ApplyOrderRefund): + case utils.Int2Str(model.ApplyOrderRefund): // 订单设置 - if setting.OrderVoiceSetting.RefundOrder == SettingOpen { // 取消打印订单 + if setting.OrderVoiceSetting.RefundOrder == model.SettingOpen { // 取消打印订单 textMsg, err = MakePrintMsgOnTemp(param, userId) if err != nil { return "", err } } - if setting.OrderVoiceSetting.RefundOrderVoice == SettingOpen && setting.SystemVoice == SettingOpen { - if setting.OrderVoiceSetting.OrderNotice == SettingOpen && setting.SystemVoice == SettingOpen { + 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` - printVoiceValue = append(printVoiceValue, ApplyRefundVoice) + printVoiceValue = append(printVoiceValue, model.ApplyRefundVoice) } } // 取消打印 - case utils.Int2Str(OrderStatusCanceled): + case utils.Int2Str(model.OrderStatusCanceled): // 订单设置 - if setting.OrderVoiceSetting.BusinessOrderCancel == SettingOpen { // 取消打印订单 + if setting.OrderVoiceSetting.BusinessOrderCancel == model.SettingOpen { // 取消打印订单 textMsg, err = MakePrintMsgOnTemp(param, userId) if err != nil { return "", err } } - if setting.OrderVoiceSetting.BusinessOrderCancelVoice == SettingOpen && setting.SystemVoice == SettingOpen { - if setting.OrderVoiceSetting.OrderNotice == SettingOpen && setting.SystemVoice == SettingOpen { // 订单取消语音通知 + 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` // 你来新订单了 - printVoiceValue = append(printVoiceValue, CancelOrderVoice) + printVoiceValue = append(printVoiceValue, model.CancelOrderVoice) } } - case utils.Int2Str(OrderStatusAccepted): // 待拣货 - if setting.PickingSetting.WaitPickingPrint == SettingOpen { // 打印订单 + case utils.Int2Str(model.OrderStatusAccepted): // 待拣货 + if setting.PickingSetting.WaitPickingPrint == model.SettingOpen { // 打印订单 textMsg, err = MakePrintMsgOnTemp(param, userId) if err != nil { return "", err } } - if setting.PickingSetting.WaitPickingVoice == SettingOpen && setting.SystemVoice == SettingOpen { // 订单通知 + if setting.PickingSetting.WaitPickingVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 订单通知 printVoiceMsg += `%s%s` // 你有订单未拣货 - printVoiceValue = append(printVoiceValue, WaitPickUpOrderVoice) + printVoiceValue = append(printVoiceValue, model.WaitPickUpOrderVoice) printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param) } - case utils.Int2Str(OrderStatusWaitAccepted): // 待接单 - if setting.PickingSetting.WaitPickingPrint == SettingOpen { // 打印订单 + case utils.Int2Str(model.OrderStatusWaitAccepted): // 待接单 + if setting.PickingSetting.WaitPickingPrint == model.SettingOpen { // 打印订单 textMsg, err = MakePrintMsgOnTemp(param, userId) if err != nil { return "", err } } - if setting.PickingSetting.WaitPickingVoice == SettingOpen && setting.SystemVoice == SettingOpen { // 订单通知 + if setting.PickingSetting.WaitPickingVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 订单通知 printVoiceMsg += `%s%s` // 你有订单未接单(订单未处理) - printVoiceValue = append(printVoiceValue, WaitOrderVoice) + printVoiceValue = append(printVoiceValue, model.WaitOrderVoice) printVoiceMsg, printVoiceValue = SyntheticSpeech(printVoiceMsg, printVoiceValue, param) } - case utils.Int2Str(OrderStatusRejection): // 拒收 - if setting.CustomerVoiceSetting.CustomerRejectionVoice == SettingOpen && setting.SystemVoice == SettingOpen { + case utils.Int2Str(model.OrderStatusRejection): // 拒收 + if setting.CustomerVoiceSetting.CustomerRejectionVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 暂无语音打印 } - if setting.CustomerVoiceSetting.CustomerRejectionPrint == SettingOpen { // 客户拒收打印 + if setting.CustomerVoiceSetting.CustomerRejectionPrint == model.SettingOpen { // 客户拒收打印 rejection := `` rejectionValue := make([]interface{}, 0, 0) rejection += `
客户拒收信息:

` rejection += `
订单号: %s

` rejection += `
订单来源: %s # %s

` rejection += `
拒收原因: %s

` - rejectionValue = append(rejectionValue, param[OrderNoPrint], param[VendorNamePrint], param[VendorOrderNoPrint], param[RejectionReasonPrint]) + rejectionValue = append(rejectionValue, param[model.OrderNoPrint], param[model.VendorNamePrint], param[model.VendorOrderNoPrint], param[model.RejectionReasonPrint]) textMsg = strings.Replace(fmt.Sprintf(strings.Replace(rejection, "\n", "", -1), rejectionValue...), "\\n", "\r\n", -1) } - case utils.Int2Str(OrderStatusCustomerService): // 客服退款 - if setting.CustomerVoiceSetting.CustcareRefundVoice == SettingOpen && setting.SystemVoice == SettingOpen { + case utils.Int2Str(model.OrderStatusCustomerService): // 客服退款 + if setting.CustomerVoiceSetting.CustcareRefundVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, BusinessResponsibilityVoice) + printVoiceValue = append(printVoiceValue, model.BusinessResponsibilityVoice) } - if setting.CustomerVoiceSetting.CustcareRefundPrint == SettingOpen { + if setting.CustomerVoiceSetting.CustcareRefundPrint == model.SettingOpen { rejection := `` rejectionValue := make([]interface{}, 0, 0) rejection += `
客服退款详情:

` @@ -313,7 +314,7 @@ func PrinterOrderVoice(param map[string]string, setting *PrintSettingObj, userId rejection += `
订单来源: %s # %s

` rejection += `
退款原因: %s

` rejection += `
退款时间: %s

` - rejectionValue = append(rejectionValue, param[OrderNoPrint], param[VendorNamePrint], param[VendorOrderNoPrint], param[CustcareRefundReasonPrint], utils.Time2DateStr(time.Now())) + rejectionValue = append(rejectionValue, param[model.OrderNoPrint], param[model.VendorNamePrint], param[model.VendorOrderNoPrint], param[model.CustcareRefundReasonPrint], utils.Time2DateStr(time.Now())) textMsg = strings.Replace(fmt.Sprintf(strings.Replace(rejection, "\n", "", -1), rejectionValue...), "\\n", "\r\n", -1) } @@ -324,7 +325,7 @@ func PrinterOrderVoice(param map[string]string, setting *PrintSettingObj, userId } // PrintWayBillOrderStatus 打印运单类通知消息 -func PrintWayBillOrderStatus(param map[string]string, setting *PrintSettingObj) string { +func PrintWayBillOrderStatus(param map[string]string, setting *model.PrintSettingObj) string { var ( printVoiceMsg string //语音信息 printVoiceValue = make([]interface{}, 0, 0) @@ -332,21 +333,21 @@ func PrintWayBillOrderStatus(param map[string]string, setting *PrintSettingObj) textMsgValue = make([]interface{}, 0, 0) // 文本信息 ) - switch param[WayBillStatusPrint] { - case utils.Int2Str(WaybillStatusAccepted), utils.Int2Str(WaybillStatusCourierAssigned): // 分配骑手 - if setting.RiderVoiceSetting.RiderTakeOrder == SettingOpen { // 打印订单 + switch param[model.WayBillStatusPrint] { + case utils.Int2Str(model.WaybillStatusAccepted), utils.Int2Str(model.WaybillStatusCourierAssigned): // 分配骑手 + if setting.RiderVoiceSetting.RiderTakeOrder == model.SettingOpen { // 打印订单 textMsg += `
接单骑手信息:

` textMsg += `
骑手姓名: %s

` textMsg += `
骑手电话: %s

` textMsg += `
接单时间: %s

` textMsg += `
订单来源: %s

` textMsg += `
单号: #%s

` - textMsgValue = append(textMsgValue, param[RiderNamePrint], param[RiderPhonePrint], utils.Time2DateStr(time.Now()), param[VendorNamePrint], param[VendorOrderNoPrint]) + textMsgValue = append(textMsgValue, param[model.RiderNamePrint], param[model.RiderPhonePrint], utils.Time2DateStr(time.Now()), param[model.VendorNamePrint], param[model.VendorOrderNoPrint]) } } - if setting.RiderVoiceSetting.RiderTakeOrderVoice == SettingOpen && setting.SystemVoice == SettingOpen { // 骑手接单语音通知 + if setting.RiderVoiceSetting.RiderTakeOrderVoice == model.SettingOpen && setting.SystemVoice == model.SettingOpen { // 骑手接单语音通知 printVoiceMsg += `%s%s` // 骑手已经接单了 - printVoiceValue = append(printVoiceValue, RiderGetOrderVoice) + printVoiceValue = append(printVoiceValue, model.RiderGetOrderVoice) } msg := strings.Replace(fmt.Sprintf(strings.Replace(textMsg, "\n", "", -1), textMsgValue...), "\\n", "\r\n", -1) @@ -355,7 +356,7 @@ func PrintWayBillOrderStatus(param map[string]string, setting *PrintSettingObj) } // PrintStoreStatus 打印门店状态 -func PrintStoreStatus(param map[string]string, setting *PrintSettingObj) string { +func PrintStoreStatus(param map[string]string, setting *model.PrintSettingObj) string { var ( printVoiceMsg string //语音信息 printVoiceValue = make([]interface{}, 0, 0) @@ -364,17 +365,17 @@ func PrintStoreStatus(param map[string]string, setting *PrintSettingObj) string ) // 离线打印文本开启 - if setting.PickingSetting.BusinessOffLine == SettingOpen { + if setting.PickingSetting.BusinessOffLine == model.SettingOpen { textMsg += `
门店下线通知

` textMsg += `
门店:%s

` textMsg += `
平台:%s

` textMsg += `
下线时间:%s

` - textMsgValue = append(textMsgValue, param[EBailOrderNoPrint], param[VendorNamePrint], utils.Time2DateStr(time.Now())) + textMsgValue = append(textMsgValue, param[model.EBailOrderNoPrint], param[model.VendorNamePrint], utils.Time2DateStr(time.Now())) } // 离线打印语音开启 - if setting.SystemVoice == SettingOpen && setting.PickingSetting.BusinessOffLineVoice == SettingOpen { + if setting.SystemVoice == model.SettingOpen && setting.PickingSetting.BusinessOffLineVoice == model.SettingOpen { printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, StoreOfflineVoice) + printVoiceValue = append(printVoiceValue, model.StoreOfflineVoice) } voice := strings.Replace(fmt.Sprintf(strings.Replace(printVoiceMsg, "\n", "", -1), printVoiceValue...), "\\n", "\r\n", -1) msg := strings.Replace(fmt.Sprintf(strings.Replace(textMsg, "\n", "", -1), textMsgValue...), "\\n", "\r\n", -1) @@ -385,54 +386,54 @@ func PrintStoreStatus(param map[string]string, setting *PrintSettingObj) string // SyntheticSpeech 合成语音 (美团xxx号订单) func SyntheticSpeech(printVoiceMsg string, printVoiceValue []interface{}, param map[string]string) (string, []interface{}) { printVoiceMsg += `%s` // 美团 - switch param[VendOrIDPrint] { - case utils.Int2Str(VendorIDJD): // 京东 - printVoiceValue = append(printVoiceValue, JdVoice) - case utils.Int2Str(VendorIDMTWM): // 美团 - printVoiceValue = append(printVoiceValue, MtVoice) - case utils.Int2Str(VendorIDELM): // 饿了么 - printVoiceValue = append(printVoiceValue, ElmVoice) - case utils.Int2Str(VendorIDEBAI): // 饿百 - printVoiceValue = append(printVoiceValue, ElmVoice) - case utils.Int2Str(VendorIDJDShop): // 京东商城 - printVoiceValue = append(printVoiceValue, JdToHose) - case utils.Int2Str(VendorIDTT): // 抖音 + switch param[model.VendOrIDPrint] { + case utils.Int2Str(model.VendorIDJD): // 京东 + printVoiceValue = append(printVoiceValue, model.JdVoice) + case utils.Int2Str(model.VendorIDMTWM): // 美团 + printVoiceValue = append(printVoiceValue, model.MtVoice) + case utils.Int2Str(model.VendorIDELM): // 饿了么 + printVoiceValue = append(printVoiceValue, model.ElmVoice) + case utils.Int2Str(model.VendorIDEBAI): // 饿百 + printVoiceValue = append(printVoiceValue, model.ElmVoice) + case utils.Int2Str(model.VendorIDJDShop): // 京东商城 + printVoiceValue = append(printVoiceValue, model.JdToHose) + case utils.Int2Str(model.VendorIDTT): // 抖音 // 暂无 } - if param[VendorOrderNoPrint] != "" { - switch len(param[VendorOrderNoPrint]) { + if param[model.VendorOrderNoPrint] != "" { + switch len(param[model.VendorOrderNoPrint]) { case 1: printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint]]) + printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint]]) case 2: printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint][:1]+"0"]) - if param[VendorOrderNoPrint][1:] != "0" { + printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][:1]+"0"]) + if param[model.VendorOrderNoPrint][1:] != "0" { printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint][1:]]) + printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][1:]]) } case 3: printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint][0:1]+"00"]) - if param[VendorOrderNoPrint][1:2] == "0" && param[VendorOrderNoPrint][2:] == "0" { + 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[VendorOrderNoPrint][1:2] == "0" && param[VendorOrderNoPrint][2:] != "0" { + } else if param[model.VendorOrderNoPrint][1:2] == "0" && param[model.VendorOrderNoPrint][2:] != "0" { printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint][1:2]]) + printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][1:2]]) printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint][2:]]) - } else if param[VendorOrderNoPrint][1:2] != "0" && param[VendorOrderNoPrint][2:] == "0" { + printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][2:]]) + } else if param[model.VendorOrderNoPrint][1:2] != "0" && param[model.VendorOrderNoPrint][2:] == "0" { printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint][1:2]+"0"]) - } else if param[VendorOrderNoPrint][1:2] != "0" && param[VendorOrderNoPrint][2:] != "0" { + 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` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint][1:2]+"0"]) + printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][1:2]+"0"]) printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, NumberVoiceMap[param[VendorOrderNoPrint][2:]]) + printVoiceValue = append(printVoiceValue, model.NumberVoiceMap[param[model.VendorOrderNoPrint][2:]]) } } } printVoiceMsg += `%s` - printVoiceValue = append(printVoiceValue, OrderNoVoice) + printVoiceValue = append(printVoiceValue, model.OrderNoVoice) return printVoiceMsg, printVoiceValue } diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 9e98120de..7fef1edda 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -3,17 +3,16 @@ package cms import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/mtunionapi" - "git.rosy.net.cn/baseapi/platformapi/tbunionapi" "reflect" "regexp" "strconv" "time" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" ) const ( @@ -44,10 +43,10 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) { "buildTime": buildTimeStr, "gitCommit": gitCommit, "metaData": map[string]interface{}{ - "vendorTypeName": model.VendorTypeName, - "vendorName": model.VendorChineseNames, - "vendorImg": model.VendorImg, - "vendorColors": model.VendorColors, + "vendorTypeName": model.VendorTypeName, + "vendorName": model.VendorChineseNames, + //"vendorImg": model.VendorImg, + //"vendorColors": model.VendorColors, "orderStatus": model.OrderStatusName, "waybillStatus": model.WaybillStatusName, "orderTypeName": model.OrderTypeName, @@ -68,12 +67,12 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) { model.VendorIDMTWM: map[int]interface{}{ mtunionapi.ActTypeQB: "券包推广", }, - model.VendorIDTB: map[int]interface{}{ - tbunionapi.TbElmActTypeBDH: "本地化", - }, - model.VendorIDPDD: map[int]interface{}{ - 1: "进行中的活动", - }, + //model.VendorIDTB: map[int]interface{}{ + // tbunionapi.TbElmActTypeBDH: "本地化", + //}, + //model.VendorIDPDD: map[int]interface{}{ + // 1: "进行中的活动", + //}, model.VendorIDJDShop: map[int]interface{}{ 2: "进行中", }, diff --git a/business/jxstore/cms/message.go b/business/jxstore/cms/message.go index 74113473b..df601a9fc 100644 --- a/business/jxstore/cms/message.go +++ b/business/jxstore/cms/message.go @@ -4,10 +4,10 @@ import ( "time" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" ) type MessageStatusExt struct { diff --git a/business/jxstore/cms/print.go b/business/jxstore/cms/print.go index b72da8684..e130fdd36 100644 --- a/business/jxstore/cms/print.go +++ b/business/jxstore/cms/print.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "net" "os" "regexp" diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index ccb887326..5fe15b04c 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -7,9 +7,9 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/auth2" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" ) var ( diff --git a/business/jxstore/common/common.go b/business/jxstore/common/common.go index d55e80483..228d23cee 100644 --- a/business/jxstore/common/common.go +++ b/business/jxstore/common/common.go @@ -6,10 +6,10 @@ import ( "git.rosy.net.cn/baseapi/platformapi/autonavi" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals/api" ) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 845487ad5..2ae743584 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -6,10 +6,10 @@ import ( "time" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" ) var ( diff --git a/business/jxutils/configindb/configindb.go b/business/jxutils/configindb/configindb.go index 34243cd65..bf735fe30 100644 --- a/business/jxutils/configindb/configindb.go +++ b/business/jxutils/configindb/configindb.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/legacymodel" ) diff --git a/business/jxutils/datares/datares.go b/business/jxutils/datares/datares.go index 5934e3a0a..a4309ac64 100644 --- a/business/jxutils/datares/datares.go +++ b/business/jxutils/datares/datares.go @@ -9,11 +9,11 @@ import ( "image/png" "net/http" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" ) diff --git a/business/jxutils/dtask/dtask.go b/business/jxutils/dtask/dtask.go index 36d3dd597..de11f2641 100644 --- a/business/jxutils/dtask/dtask.go +++ b/business/jxutils/dtask/dtask.go @@ -7,8 +7,8 @@ import ( "time" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals/refutil" ) diff --git a/business/jxutils/tasks/configrefresh.go b/business/jxutils/tasks/configrefresh.go index b0ba7b769..d4478f0e1 100644 --- a/business/jxutils/tasks/configrefresh.go +++ b/business/jxutils/tasks/configrefresh.go @@ -8,9 +8,9 @@ import ( "git.rosy.net.cn/baseapi/platformapi" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxutils/eventhub/syseventhub" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/globals/api" diff --git a/business/model/const.go b/business/model/const.go index 05b1bbc62..9823f4aee 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -208,6 +208,25 @@ var ( 0: "休息", 1: "营业", } + + UnionOrderStatusName = map[int]string{ + UnionOrderStatusNew: "新订单", + UnionOrderStatusPay: "用户已支付", + UnionOrderStatusTakeOver: "用户已确认收货", + UnionOrderStatusAuditOver: "已审核", + UnionOrderStatusFinish: "已完成（已结算）", + UnionOrderStatusFail: "已退款（结算失败）", + } +) + +//联盟订单状态 +const ( + UnionOrderStatusNew = 10 //已领券？还未支付 + UnionOrderStatusPay = 15 //已支付 + UnionOrderStatusTakeOver = 20 //确认收货，已收到货 + UnionOrderStatusAuditOver = 25 //审核成功，待结算 + UnionOrderStatusFinish = 110 //已结算 + UnionOrderStatusFail = 115 //审核失败，结算失败 ) const ( diff --git a/business/model/print_setting.go b/business/model/print_setting.go index a9cf46722..66b05db45 100644 --- a/business/model/print_setting.go +++ b/business/model/print_setting.go @@ -2,9 +2,6 @@ package model import ( "encoding/json" - "errors" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/model/dao" "time" ) @@ -94,26 +91,6 @@ type ShopPickingVoice struct { WaitPickingVoice int `json:"wait_picking_voice"` // 待拣货语音[1打开] } -func GetPrintSetting(printNo string) (*PrintSettingObj, error) { - sql := ` SELECT * FROM print_setting WHERE print_no = ? and deleted_at = ? ` - sqlParams := []interface{}{ - printNo, - utils.DefaultTimeValue, - } - - var printSetting *PrintSetting - if err := dao.GetRows(dao.GetDB(), &printSetting, sql, sqlParams...); err != nil { - return nil, err - } - if printSetting == nil { - return nil, errors.New("数据查询异常") - } - - return UnMarshalString2Json(printSetting) -} - -// 将打印机设置转换一下 - // UnMarshalString2Json 将字符串设置转换为对象设置 func UnMarshalString2Json(param *PrintSetting) (*PrintSettingObj, error) { var ( diff --git a/business/model/print_temp.go b/business/model/print_temp.go index 1903ecb9f..aa8bd101a 100644 --- a/business/model/print_temp.go +++ b/business/model/print_temp.go @@ -1,8 +1,6 @@ package model import ( - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/model/dao" "time" ) @@ -51,26 +49,3 @@ const ( SettingOpen = 1 // 开启 SettingClose = -1 // 关闭 ) - -// SelectUserDefaultTemp 查询用户默认模板 -func SelectUserDefaultTemp(userId string, tempType string) (*SystemTemp, bool, error) { - var result *SystemTemp - if err := dao.GetRow(dao.GetDB(), &result, `SELECT * FROM system_temp WHERE user_id = ? AND temp_type = ? AND is_use = ? AND deleted_at = ? ORDER BY created_at desc `, []interface{}{userId, tempType, 1, utils.DefaultTimeValue}...); err != nil { - return nil, false, err - } - return result, true, nil -} - -// QuerySystemTemp 查询系统模板 -func QuerySystemTemp() ([]*SystemTemp, error) { - var result []*SystemTemp - if err := dao.GetRows(dao.GetDB(), &result, `SELECT * FROM system_temp WHERE user_id = ? ORDER BY created_at desc `, []interface{}{"system_user"}...); err != nil { - return nil, err - } - return result, nil -} - -// AddTemp 添加模板数据 -func AddTemp(param *SystemTemp) error { - return dao.CreateEntity(dao.GetDB(), param) -} diff --git a/controllers/api_controller.go b/controllers/api_controller.go index efc7299eb..52f9c42e3 100644 --- a/controllers/api_controller.go +++ b/controllers/api_controller.go @@ -6,10 +6,10 @@ import ( "encoding/json" "fmt" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/dao" "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/client/orm" "github.com/astaxie/beego/server/web" @@ -348,7 +348,7 @@ func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data, errCode s return "", model.ErrCodeGeneralFailed, err } // 查询打印机设置 - printSetting, err := model.GetPrintSetting(printNo) + printSetting, err := dao.GetPrintSetting(printNo) if err != nil { return "", model.ErrCodeGeneralFailed, err } @@ -358,7 +358,7 @@ func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data, errCode s } // 查询用户模板 - printMsg, err := model.MakePrintMsgOnTempVoice(contentMap, printSetting, printObj.UserId) + printMsg, err := dao.MakePrintMsgOnTempVoice(contentMap, printSetting, printObj.UserId) if err != nil { return "", model.ErrCodeGeneralFailed, err } diff --git a/main.go b/main.go index 94125ee00..3b928b470 100644 --- a/main.go +++ b/main.go @@ -3,24 +3,18 @@ package main import ( "flag" "fmt" + "git.rosy.net.cn/jx-callback/business/jxstore/cms" + "git.rosy.net.cn/jx-callback/business/jxstore/misc" + _ "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/controllers" "git.rosy.net.cn/jx-callback/globals" + _ "git.rosy.net.cn/jx-callback/globals/api" + "git.rosy.net.cn/jx-callback/globals/beegodb" + _ "git.rosy.net.cn/jx-callback/routers" + beego "github.com/astaxie/beego/server/web" _ "net/http/pprof" "os" "time" - - "git.rosy.net.cn/jx-callback/business/jxstore/cms" - "git.rosy.net.cn/jx-callback/business/jxstore/misc" - beego "github.com/astaxie/beego/server/web" - - // 导入缺省订单调度器 - - "git.rosy.net.cn/jx-callback/globals/beegodb" - - _ "git.rosy.net.cn/jx-callback/globals/api" - - _ "git.rosy.net.cn/jx-callback/business/model" - _ "git.rosy.net.cn/jx-callback/routers" ) var (