diff --git a/business/model/bill.go b/business/model/bill.go new file mode 100644 index 000000000..8b5379070 --- /dev/null +++ b/business/model/bill.go @@ -0,0 +1 @@ +package model diff --git a/business/model/legacymodel/blackclient.go b/business/model/legacymodel/blackclient.go deleted file mode 100644 index 439c477f2..000000000 --- a/business/model/legacymodel/blackclient.go +++ /dev/null @@ -1,12 +0,0 @@ -package legacymodel - -import "time" - -type BlackClient struct { - ID int `orm:"column(id)"` - Mobile string `orm:"size(16);unique"` - Name string `orm:"size(8)"` - Note string `orm:"size(256)"` - CreatedAt time.Time `orm:"auto_now_add;type(datetime);null"` - UpdatedAt time.Time `orm:"auto_now;type(datetime);null"` -} diff --git a/business/model/legacymodel/config.go b/business/model/legacymodel/config.go deleted file mode 100644 index b0ab1ef26..000000000 --- a/business/model/legacymodel/config.go +++ /dev/null @@ -1,9 +0,0 @@ -package legacymodel - -type Config struct { - Id int - Thirdparty string `orm:"size(20);unique" json:"key"` - Token string `orm:"size(300)" json:"value"` - Date string `orm:"size(30)" json:"date"` - LastOperator string `orm:"size(32)" json:"lastOperator"` // 最后操作员 -} diff --git a/business/model/legacymodel/ebaishoplicence.go b/business/model/legacymodel/ebaishoplicence.go deleted file mode 100644 index bfe9dd3d1..000000000 --- a/business/model/legacymodel/ebaishoplicence.go +++ /dev/null @@ -1,14 +0,0 @@ -package legacymodel - -import "git.rosy.net.cn/jx-callback/business/model" - -type EbaiShopLicence struct { - model.ModelIDCUL - - ShopName string - Licence string - Address string - Owner string - Tel string - LicenceName string -} diff --git a/business/model/legacymodel/jxbadcomments.go b/business/model/legacymodel/jxbadcomments.go deleted file mode 100644 index b5ab82c35..000000000 --- a/business/model/legacymodel/jxbadcomments.go +++ /dev/null @@ -1,56 +0,0 @@ -package legacymodel - -import "time" - -type JxBadComments struct { - Id int `json:"id" orm:"column(id)"` - CreatedAt time.Time `orm:"auto_now_add;type(datetime);null" json:"createdAt"` - OrderId string `json:"order_id" orm:"column(order_id);size(25);unique" description:"订单ID"` - Jxstoreid string `json:"jxstoreid" orm:"column(jxstoreid);size(11);index" description:"京西门店ID"` - Userphone string `json:"userPhone" orm:"column(userphone);size(255);null" description:"评价的用户的联系方式"` - Status int `json:"status" orm:"column(status)" description:"当前评论的状态(0:未解决 1:已解决)"` - Maxmodifytime int `json:"maxModifyTime" orm:"column(maxmodifytime);null" description:"评论可修改的最大时间"` - OrderFlag string `json:"order_flag" orm:"column(order_flag);size(255);null" description:"订单类别(0:京东 1:美团 2:饿了么)"` - - Createtime string `json:"createTime" orm:"column(createtime);size(255);null;index" description:"评论的创建时间"` - Score int `json:"score4" orm:"column(score)" description:"评论的星级"` - Scorecontent string `json:"score4Content" orm:"column(scorecontent);size(255);null" description:"评论的内容"` - Vendertags string `json:"venderTags" orm:"column(vendertags);size(255);null" description:"评论的标签"` - Msg string `json:"-" orm:"column(msg);type(text)" description:"未解决差评的原始信息"` - - Updatetime string `json:"updateTime" orm:"column(updatetime);size(255);null" description:"评论的修改时间"` - UpdatedScore int `json:"updatedScore" orm:"column(updated_score);null" description:"更改后的分数"` - UpdatedScorecontent string `json:"updatedScoreContent" orm:"column(updated_scorecontent);size(255);null" description:"更改后的评论信息"` - UpdatedVendertags string `json:"updatedVenderTags" orm:"column(updated_vendertags);size(255);null" description:"更改后的标签信息"` - UpdatedMsg string `json:"-" orm:"column(updated_msg);type(text);null" description:"解决后的差评的原始信息"` - - LastPushTime string `json:"-" orm:"column(last_push_time);size(255);null" description:"上一次推送的时间"` - PushNo int `json:"-" orm:"column(push_no);null" description:"推送次数"` -} - -func (*JxBadComments) TableName() string { - return "jx_bad_comments" -} - -// type JxBadComments2 struct { -// Id int `json:"id" orm:"column(id)"` -// CreatedAt time.Time `orm:"auto_now_add;type(datetime);null" json:"createdAt"` -// OrderId string `json:"order_id" orm:"column(order_id);size(25);unique" description:"订单ID"` -// Jxstoreid string `json:"jxstoreid" orm:"column(jxstoreid);size(11);index" description:"京西门店ID"` -// Userphone string `json:"userPhone" orm:"column(userphone);size(255);null" description:"评价的用户的联系方式"` -// Status int `json:"status" orm:"column(status)" description:"当前评论的状态(0:未解决 1:已解决)"` -// Createtime string `json:"createTime" orm:"column(createtime);size(255);null" description:"评论的创建时间"` -// Maxmodifytime int `json:"maxModifyTime" orm:"column(maxmodifytime);null" description:"评论可修改的最大时间"` -// Score int `json:"score4" orm:"column(score)" description:"评论的星级"` -// Scorecontent string `json:"score4Content" orm:"column(scorecontent);size(255);null" description:"评论的内容"` -// Vendertags string `json:"venderTags" orm:"column(vendertags);size(255);null" description:"评论的标签"` -// Updatetime string `json:"updateTime" orm:"column(updatetime);size(255);null" description:"评论的修改时间"` -// UpdatedScore int `json:"updatedScore" orm:"column(updated_score);null" description:"更改后的分数"` -// UpdatedScorecontent string `json:"updatedScoreContent" orm:"column(updated_scorecontent);size(255);null" description:"更改后的评论信息"` -// UpdatedVendertags string `json:"updatedVenderTags" orm:"column(updated_vendertags);size(255);null" description:"更改后的标签信息"` -// OrderFlag string `json:"order_flag" orm:"column(order_flag);size(255);null" description:"订单类别(0:京东 1:美团 2:饿了么)"` -// Msg string `json:"-" orm:"column(msg);type(text)" description:"未解决差评的原始信息"` -// UpdatedMsg string `json:"-" orm:"column(updated_msg);type(text);null" description:"解决后的差评的原始信息"` -// LastPushTime string `json:"-" orm:"column(last_push_time);size(255);null" description:"上一次推送的时间"` -// PushNo int `json:"-" orm:"column(push_no);null" description:"推送次数"` -// } diff --git a/business/model/legacymodel/storebill.go b/business/model/legacymodel/storebill.go deleted file mode 100644 index d227e1a9c..000000000 --- a/business/model/legacymodel/storebill.go +++ /dev/null @@ -1,23 +0,0 @@ -package legacymodel - -import "time" - -type StoreBill struct { - Id int `orm:"column(id);auto" json:"id"` - Date time.Time `orm:"column(date);type(datetime)" json:"date"` - Url string `orm:"column(url);size(255)" json:"url"` - StoreId int `orm:"column(store_id)" json:"storeId"` - BillName string `orm:"column(bill_name);size(30)" json:"billName"` - ShopName string `orm:"size(30)" json:"shopName"` - BillTitle string `orm:"size(255)" json:"billTitle"` -} - -func (t *StoreBill) TableName() string { - return "store_bill" -} - -func (*StoreBill) TableIndex() [][]string { - return [][]string{ - []string{"StoreId", "Date"}, - } -} diff --git a/business/model/legacymodel/weixins.go b/business/model/legacymodel/weixins.go deleted file mode 100644 index 765a2fc33..000000000 --- a/business/model/legacymodel/weixins.go +++ /dev/null @@ -1,21 +0,0 @@ -package legacymodel - -import "time" - -type WeiXins struct { - ID int `orm:"column(id)" json:"id"` - CreatedAt time.Time `orm:"auto_now_add;type(datetime);null" json:"createdAt"` - UpdatedAt time.Time `orm:"auto_now;type(datetime);null" json:"updatedAt"` - LastOperator string `orm:"size(32)" json:"lastOperator"` // 最后操作员 - JxStoreID int `orm:"column(jxstoreid);index" json:"storeID"` - OpenID string `orm:"column(openid);size(70);unique;null" json:"openID"` - OpenIDMini string `orm:"column(openid_mini);size(70);unique;null" json:"openIDMini"` - OpenIDUnion string `orm:"column(openid_union);size(70);unique;null" json:"openIDUnion"` - Tel string `orm:"size(15);null;unique" json:"tel"` - ParentID int `orm:"column(parentid);default(-1);index" json:"parentID"` - NickName string `orm:"column(nickname);size(30)" json:"nickname"` -} - -func (*WeiXins) TableName() string { - return "weixins" -} diff --git a/business/model/user.go b/business/model/user.go index f78cb0489..1f3623d33 100644 --- a/business/model/user.go +++ b/business/model/user.go @@ -220,58 +220,3 @@ func (v *UserMember) TableIndex() [][]string { []string{"CreatedAt"}, } } - -type Role struct { - ModelIDCULD - - Name string `json:"name"` //角色名 -} - -func (*Role) TableUnique() [][]string { - return [][]string{ - []string{"Name", "DeletedAt"}, - } -} - -type UserRole struct { - ModelIDCULD - - UserID string `orm:"column(user_id)" json:"userID"` //用户ID - RoleID int `orm:"column(role_id)" json:"roleID"` //角色ID -} - -func (*UserRole) TableUnique() [][]string { - return [][]string{ - []string{"UserID", "RoleID", "DeletedAt"}, - } -} - -type Menu struct { - ModelIDCULD - - Name string `json:"name"` //功能名 - URL string `orm:"column(url)" json:"url"` //路径 - ImgURL string `orm:"column(img_url)" json:"imgURL"` //图标 - Level int `json:"level"` //级别 - ParentID int `orm:"column(parent_id)" json:"parentID"` //父功能ID - Color string `json:"color"` //颜色 -} - -func (*Menu) TableUnique() [][]string { - return [][]string{ - []string{"Name", "DeletedAt"}, - } -} - -type RoleMenu struct { - ModelIDCULD - - RoleID int `orm:"column(role_id)" json:"roleID"` //角色ID - MenuID int `orm:"column(menu_id)" json:"menuID"` //功能ID -} - -func (*RoleMenu) TableUnique() [][]string { - return [][]string{ - []string{"MenuID", "RoleID", "DeletedAt"}, - } -} diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 5d1f0e6eb..69caa4e2b 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -2,8 +2,6 @@ package beegodb import ( "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/legacymodel" - "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego" "github.com/astaxie/beego/orm" ) @@ -11,86 +9,86 @@ import ( func Init() { // set default database orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30) - orm.RegisterModel(new(legacymodel.Config)) - orm.RegisterModel(new(legacymodel.BlackClient)) - orm.RegisterModel(new(legacymodel.JxBadComments)) - orm.RegisterModel(new(legacymodel.StoreBill)) + // orm.RegisterModel(new(legacymodel.Config)) + // orm.RegisterModel(new(legacymodel.BlackClient)) + // orm.RegisterModel(new(legacymodel.JxBadComments)) + // orm.RegisterModel(new(legacymodel.StoreBill)) // if !globals.DisableWXAuth1 { // orm.RegisterModel(new(legacymodel.WeiXins)) // } - orm.RegisterModel(new(model.GoodsOrder)) - orm.RegisterModel(new(model.GoodsOrderOriginal)) - orm.RegisterModel(new(model.TempGoodsOrderMobile)) - orm.RegisterModel(new(model.OrderSku)) - orm.RegisterModel(new(model.Waybill)) - orm.RegisterModel(new(model.OrderStatus)) + // orm.RegisterModel(new(model.GoodsOrder)) + // orm.RegisterModel(new(model.GoodsOrderOriginal)) + // orm.RegisterModel(new(model.TempGoodsOrderMobile)) + // orm.RegisterModel(new(model.OrderSku)) + // orm.RegisterModel(new(model.Waybill)) + // orm.RegisterModel(new(model.OrderStatus)) - orm.RegisterModel(new(model.Message)) - orm.RegisterModel(new(model.MessageStatus)) - orm.RegisterModel(new(model.ImMessageRecord)) + // orm.RegisterModel(new(model.Message)) + // orm.RegisterModel(new(model.MessageStatus)) + // orm.RegisterModel(new(model.ImMessageRecord)) - orm.RegisterModel(&model.Place{}) - orm.RegisterModel(&model.Store{}, &model.StoreSub{}, &model.StoreMap{}, &model.StoreCourierMap{}, &model.StoreCategoryMap{}) - orm.RegisterModel(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{}) - orm.RegisterModel(&model.SkuVendorCategoryMap{}) //商品映射平台类目 - orm.RegisterModel(&model.StoreSkuBindHistory{}) - orm.RegisterModel(&model.StoreSkuAudit{}) - orm.RegisterModel(&model.SkuCategory{}) - orm.RegisterModel(&model.ThingMap{}) - orm.RegisterModel(&model.SkuExinfoMap{}) - orm.RegisterModel(&model.StorePushClient{}) - orm.RegisterModel(&model.StoreAudit{}) + // orm.RegisterModel(&model.Place{}) + // orm.RegisterModel(&model.Store{}, &model.StoreSub{}, &model.StoreMap{}, &model.StoreCourierMap{}, &model.StoreCategoryMap{}) + // orm.RegisterModel(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{}) + // orm.RegisterModel(&model.SkuVendorCategoryMap{}) //商品映射平台类目 + // orm.RegisterModel(&model.StoreSkuBindHistory{}) + // orm.RegisterModel(&model.StoreSkuAudit{}) + // orm.RegisterModel(&model.SkuCategory{}) + // orm.RegisterModel(&model.ThingMap{}) + // orm.RegisterModel(&model.SkuExinfoMap{}) + // orm.RegisterModel(&model.StorePushClient{}) + // orm.RegisterModel(&model.StoreAudit{}) orm.RegisterModel(&model.AuthBind{}, &model.User{}) - orm.RegisterModel(&model.PageShop{}) - orm.RegisterModel(&model.VendorStoreSnapshot{}) - orm.RegisterModel(&model.PriceReferSnapshot{}) - orm.RegisterModel(&model.StorePriceScoreSnapshot{}) - orm.RegisterModel(&model.StoreSkuNamePrice{}) - orm.RegisterModel(&model.OrderSupplementFee{}) - orm.RegisterModel(&model.OperateEvent{}) - orm.RegisterModel(&model.OperateEventDetail{}) + // orm.RegisterModel(&model.PageShop{}) + // orm.RegisterModel(&model.VendorStoreSnapshot{}) + // orm.RegisterModel(&model.PriceReferSnapshot{}) + // orm.RegisterModel(&model.StorePriceScoreSnapshot{}) + // orm.RegisterModel(&model.StoreSkuNamePrice{}) + // orm.RegisterModel(&model.OrderSupplementFee{}) + // orm.RegisterModel(&model.OperateEvent{}) + // orm.RegisterModel(&model.OperateEventDetail{}) // orm.RegisterModel(&model.ActivityForSku{}) // orm.RegisterModel(&legacymodel.JxBadComments2{}) - if globals.EnablePendingChange { - orm.RegisterModel(&model.StoreOpRequest{}) - } + // if globals.EnablePendingChange { + // orm.RegisterModel(&model.StoreOpRequest{}) + // } // 如下语句建表时要出错（INDEX名字太长了），暂时放一下，必须放最后一句 - orm.RegisterModel(&model.OrderFinancial{}, &model.AfsOrder{}, &model.OrderDiscountFinancial{}, &model.OrderSkuFinancial{}) - orm.RegisterModel(&model.PriceDefendOrder{}) - orm.RegisterModel(&model.Act{}, &model.ActOrderRule{}, &model.ActStoreSku{}) - orm.RegisterModel(&model.ActMap{}, &model.ActStoreSkuMap{}) - if globals.IsStoreSkuAct { - orm.RegisterModel(&model.StoreSkuAct{}) - } + // orm.RegisterModel(&model.OrderFinancial{}, &model.AfsOrder{}, &model.OrderDiscountFinancial{}, &model.OrderSkuFinancial{}) + // orm.RegisterModel(&model.PriceDefendOrder{}) + // orm.RegisterModel(&model.Act{}, &model.ActOrderRule{}, &model.ActStoreSku{}) + // orm.RegisterModel(&model.ActMap{}, &model.ActStoreSkuMap{}) + // if globals.IsStoreSkuAct { + // orm.RegisterModel(&model.StoreSkuAct{}) + // } - orm.RegisterModel(&model.NewConfig{}) + // orm.RegisterModel(&model.NewConfig{}) - orm.RegisterModel(&model.CasbinRule{}) - orm.RegisterModel(&model.SensitiveWord{}) - orm.RegisterModel(&model.StoreScore{}) - orm.RegisterModel(&model.StoreAlert{}) - orm.RegisterModel(&model.FoodRecipe{}, &model.FoodRecipeStep{}, &model.FoodRecipeItem{}, &model.FoodRecipeItemChoice{}, &model.FoodRecipeUser{}) - orm.RegisterModel(&model.DataResource{}) + // orm.RegisterModel(&model.CasbinRule{}) + // orm.RegisterModel(&model.SensitiveWord{}) + // orm.RegisterModel(&model.StoreScore{}) + // orm.RegisterModel(&model.StoreAlert{}) + // orm.RegisterModel(&model.FoodRecipe{}, &model.FoodRecipeStep{}, &model.FoodRecipeItem{}, &model.FoodRecipeItemChoice{}, &model.FoodRecipeUser{}) + // orm.RegisterModel(&model.DataResource{}) - orm.RegisterModel(&model.UserDeliveryAddress{}) - orm.RegisterModel(&model.UserCartItem{}) - orm.RegisterModel(&model.UserAgreement{}) - orm.RegisterModel(&model.UserMember{}) - orm.RegisterModel(&model.OrderPay{}, &model.OrderPayRefund{}) - orm.RegisterModel(&model.UserOrderSms{}) + // orm.RegisterModel(&model.UserDeliveryAddress{}) + // orm.RegisterModel(&model.UserCartItem{}) + // orm.RegisterModel(&model.UserAgreement{}) + // orm.RegisterModel(&model.UserMember{}) + // orm.RegisterModel(&model.OrderPay{}, &model.OrderPayRefund{}) + // orm.RegisterModel(&model.UserOrderSms{}) - orm.RegisterModel(&model.FakeJdThingMap{}) + // orm.RegisterModel(&model.FakeJdThingMap{}) //权限 - orm.RegisterModel(&model.Role{}) - orm.RegisterModel(&model.UserRole{}) - orm.RegisterModel(&model.Menu{}) - orm.RegisterModel(&model.RoleMenu{}) + // orm.RegisterModel(&model.Role{}) + // orm.RegisterModel(&model.UserRole{}) + // orm.RegisterModel(&model.Menu{}) + // orm.RegisterModel(&model.RoleMenu{}) // create table orm.RunSyncdb("default", false, true) }