diff --git a/model/app_model/print_bill.go b/model/app_model/print_bill.go index 26a50d8..5b6e230 100644 --- a/model/app_model/print_bill.go +++ b/model/app_model/print_bill.go @@ -7,7 +7,7 @@ type PrintBill struct { ID int `orm:"column(id)" json:"id" db:"id"` CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` - PrintNo string `orm:"type(varchar);size(32);index" json:"print_no" db:"print_no"` // 打印机编号 - PrintBalance int64 `orm:"type(int);size(16)" json:"print_balance" db:"print_balance"` // 账户余额 - UserId string `orm:"type(varchar);size(125)" json:"user_id" db:"user_id"` // 打印机所属用户 + PrintNo string `orm:"type(varchar);size(32);index" json:"print_no" db:"print_no"` // 打印机编号 + PrintBalance int64 `orm:"type(int);size(16)" json:"print_balance" db:"print_balance"` // 账户余额 + UserId string `orm:"column(user_id);type(varchar);size(125)" json:"user_id" db:"user_id"` // 打印机所属用户 } diff --git a/model/app_model/print_bill_record.go b/model/app_model/print_bill_record.go index 6e1334b..e16f9f5 100644 --- a/model/app_model/print_bill_record.go +++ b/model/app_model/print_bill_record.go @@ -7,9 +7,9 @@ type PrintBillRecord struct { ID int `orm:"column(id)" json:"id" db:"id"` CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` - PrintNo string `orm:"type(varchar);size(32);index" json:"print_no" db:"print_no"` // 打印机编号 - PayType int `orm:"type(int);size(2)" json:"pay_type" db:"pay_type"` // 支付类型[1-充值/2-支出] - PayMoney int `orm:"type(int);size(10)" json:"pay_money" db:"pay_money"` // 金额 - OrderId string `orm:"type(varchar);size(64);index" json:"order_id" db:"order_id"` // 订单号 - UserId string `orm:"type(varchar);size(125)" json:"user_id" db:"user_id"` // 打印机所属用户 + PrintNo string `orm:"type(varchar);size(32);index" json:"print_no" db:"print_no"` // 打印机编号 + PayType int `orm:"type(int);size(2)" json:"pay_type" db:"pay_type"` // 支付类型[1-充值/2-支出] + PayMoney int `orm:"type(int);size(10)" json:"pay_money" db:"pay_money"` // 金额 + OrderId string `orm:"column(order_id);type(varchar);size(64);index" json:"order_id" db:"order_id"` // 订单号 + UserId string `orm:"column(user_id);type(varchar);size(125)" json:"user_id" db:"user_id"` // 打印机所属用户 } diff --git a/model/app_model/print_bind_store.go b/model/app_model/print_bind_store.go index 4bafb97..4b6df43 100644 --- a/model/app_model/print_bind_store.go +++ b/model/app_model/print_bind_store.go @@ -15,15 +15,15 @@ const ( type PrintBindStore struct { ID int `orm:"column(id)" json:"id" db:"id"` - CreatedAt time.Time `orm:"type(datetime)" json:"created_at" db:"created_at"` // 创建时间 - UpdatedAt time.Time `orm:"type(datetime)" json:"updated_at" db:"updated_at"` // 更新时间 - StoreID int64 `orm:"column(store_id);type(int);size(11)" json:"store_id" db:"store_id"` // 门店id(为京西创建门店id)唯一 - StoreName string `orm:"type(varchar);size(255)" json:"store_name" db:"store_name"` // 门店名称 - StoreVendor int `orm:"type(int);size(2)" json:"store_vendor" db:"store_vendor"` // 门店平台 - PrintNo string `orm:"type(varchar);size(32);index" json:"print_no" db:"print_no"` // 打印机编号 - UserId string `orm:"type(varchar);size(125)" json:"user_id" db:"user_id"` // 打印机所属用户 - StoreStatus int `orm:"type(int);size(2)" json:"store_status" db:"store_status"` // 门店状态 - BindStatus int `orm:"type(int);size(2)" json:"bind_status" db:"bind_status"` // 绑定状态 + CreatedAt time.Time `orm:"type(datetime)" json:"created_at" db:"created_at"` // 创建时间 + UpdatedAt time.Time `orm:"type(datetime)" json:"updated_at" db:"updated_at"` // 更新时间 + StoreID int64 `orm:"column(store_id);type(int);size(11)" json:"store_id" db:"store_id"` // 门店id(为京西创建门店id)唯一 + StoreName string `orm:"type(varchar);size(255)" json:"store_name" db:"store_name"` // 门店名称 + StoreVendor int `orm:"type(int);size(2)" json:"store_vendor" db:"store_vendor"` // 门店平台 + PrintNo string `orm:"type(varchar);size(32);index" json:"print_no" db:"print_no"` // 打印机编号 + UserId string `orm:"column(user_id);type(varchar);size(125)" json:"user_id" db:"user_id"` // 打印机所属用户 + StoreStatus int `orm:"type(int);size(2)" json:"store_status" db:"store_status"` // 门店状态 + BindStatus int `orm:"type(int);size(2)" json:"bind_status" db:"bind_status"` // 绑定状态 } // AddBindStore 添加门店授权 @@ -37,7 +37,7 @@ type AddBindStore struct { // RelieveStore 解除门店授权 type RelieveStore struct { - UserId string `orm:"type(varchar);size(125)" json:"user_id" db:"user_id"` // 打印机所属用户 - StoreID int64 `json:"store_id" form:"store_id" binding:"required"` // 门店id(为京西创建门店id) - PrintNo string `json:"print_no" form:"print_no" binding:"required"` // 打印机编号 + UserId string `orm:"column(user_id);type(varchar);size(125)" json:"user_id" db:"user_id"` // 打印机所属用户 + StoreID int64 `json:"store_id" form:"store_id" binding:"required"` // 门店id(为京西创建门店id) + PrintNo string `json:"print_no" form:"print_no" binding:"required"` // 打印机编号 } diff --git a/model/app_model/print_setting.go b/model/app_model/print_setting.go index 5f51b4c..f6294da 100644 --- a/model/app_model/print_setting.go +++ b/model/app_model/print_setting.go @@ -4,7 +4,7 @@ import "time" // PrintSetting 打印机设置 type PrintSetting struct { - ID int `json:"id" db:"id"` + ID int `orm:"column(id)" json:"id" db:"id"` CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` DeletedAt time.Time `json:"deleted_at" db:"deleted_at"` @@ -12,11 +12,11 @@ type PrintSetting struct { CallNameSetting int `orm:"type(int);size(4);default(64)" json:"call_name_setting" db:"call_name_setting"` // 称谓设置 [64-默认老板] SystemVoice int `orm:"type(tinyint);size(2);default(1)" json:"system_voice" db:"system_voice"` // 平台语音开关[1打开] - PrintVoiceSetting string `orm:"type(varchar);size(255)" json:"print_voice_setting" db:"print_voice_setting"` // 打印机提示语音设置 - OrderVoiceSetting string `orm:"type(varchar);size(255)" json:"order_voice_setting" db:"order_voice_setting"` // 订单提示设置 - RiderVoiceSetting string `orm:"type(varchar);size(255)" json:"rider_voice_setting" db:"rider_voice_setting"` // 骑手动态提示设置 - CustomerVoiceSetting string `orm:"type(varchar);size(255)" json:"customer_voice_setting" db:"customer_voice_setting"` // 客户收货提示设置 - PickingSetting string `orm:"type(varchar);size(255)" json:"picking_setting" db:"picking_setting"` // 拣货语音设置 + PrintVoiceSetting string `orm:"type(varchar);size(512)" json:"print_voice_setting" db:"print_voice_setting"` // 打印机提示语音设置 + OrderVoiceSetting string `orm:"type(varchar);size(512)" json:"order_voice_setting" db:"order_voice_setting"` // 订单提示设置 + RiderVoiceSetting string `orm:"type(varchar);size(512)" json:"rider_voice_setting" db:"rider_voice_setting"` // 骑手动态提示设置 + CustomerVoiceSetting string `orm:"type(varchar);size(512)" json:"customer_voice_setting" db:"customer_voice_setting"` // 客户收货提示设置 + PickingSetting string `orm:"type(varchar);size(512)" json:"picking_setting" db:"picking_setting"` // 拣货语音设置 } type PrintSettingObj struct { diff --git a/model/app_model/system_temp.go b/model/app_model/system_temp.go index 31a0e88..8aee97d 100644 --- a/model/app_model/system_temp.go +++ b/model/app_model/system_temp.go @@ -16,20 +16,20 @@ const ( ) type SystemTemp struct { - ID int `json:"id" db:"id"` + ID int `orm:"column(id)" json:"id" db:"id"` CreatedAt *time.Time `json:"created_at" db:"created_at"` UpdatedAt *time.Time `json:"updated_at" db:"updated_at"` LastOperator string `json:"last_operator" db:"last_operator"` DeletedAt *time.Time `json:"deleted_at" db:"deleted_at"` - TempName string `json:"temp_name" db:"temp_name"` // 模板名称 - TempRank string `json:"temp_rank" db:"temp_rank"` // 模板顺序 - Temp string `json:"temp" db:"temp"` // 模板 - UserId string `json:"user_id" db:"user_id"` // 所属用户 - TempType string `json:"temp_type" db:"temp_type"` // 模板类型 user_store/user_consumer - TempSize string `json:"temp_size" db:"temp_size"` // 模板尺寸 big/medium/small - PrintSn string `json:"print_sn" db:"print_sn"` // 模板所属打印机 - IsUse int `json:"is_use" db:"is_use"` // 默认使用 1-使用/2-不使用 - Properties string `json:"properties" db:"properties"` // 模板字段属性 + TempName string `json:"temp_name" db:"temp_name"` // 模板名称 + TempRank string `orm:"type(text)" json:"temp_rank" db:"temp_rank"` // 模板顺序 + Temp string `orm:"type(text)" json:"temp" db:"temp"` // 模板 + UserId string `json:"user_id" db:"user_id"` // 所属用户 + TempType string `json:"temp_type" db:"temp_type"` // 模板类型 user_store/user_consumer + TempSize string `json:"temp_size" db:"temp_size"` // 模板尺寸 big/medium/small + PrintSn string `json:"print_sn" db:"print_sn"` // 模板所属打印机 + IsUse int `json:"is_use" db:"is_use"` // 默认使用 1-使用/2-不使用 + Properties string `orm:"type(text)" json:"properties" db:"properties"` // 模板字段属性 } type AddTemp struct {