diff --git a/business/controller/elm/order_legacy.go b/business/controller/elm/order_legacy.go index 88274aefd..18640703c 100644 --- a/business/controller/elm/order_legacy.go +++ b/business/controller/elm/order_legacy.go @@ -3,7 +3,7 @@ package elm import ( "github.com/astaxie/beego/orm" - "git.rosy.net.cn/jx-callback/business/legacyorder" + "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/globals" @@ -15,7 +15,7 @@ import ( func (c *OrderController) legacyWriteElmOrder(order *model.GoodsOrder) (err error) { db := orm.NewOrm() _, msgType := c.spliltCompositeState(order.VendorStatus) - legacyOrder := &legacyorder.Elemeorder2{ + legacyOrder := &legacymodel.Elemeorder2{ Orderid: order.VendorOrderID, Type: msgType, Consignee: order.ConsigneeName, @@ -31,7 +31,7 @@ func (c *OrderController) legacyWriteElmOrder(order *model.GoodsOrder) (err erro func (c *OrderController) legacyElmOrderStatusChanged(status *model.OrderStatus) (err error) { db := orm.NewOrm() - legacyOrder := &legacyorder.Elemeorder2{ + legacyOrder := &legacymodel.Elemeorder2{ Orderid: status.VendorOrderID, } if err = db.Read(legacyOrder, "Orderid"); err == nil { diff --git a/business/controller/jd/order_legacy.go b/business/controller/jd/order_legacy.go index 51b49c0b2..587b2f1fe 100644 --- a/business/controller/jd/order_legacy.go +++ b/business/controller/jd/order_legacy.go @@ -2,7 +2,7 @@ package jd import ( "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/legacyorder" + "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/orm" @@ -14,7 +14,7 @@ func (c *OrderController) legacyWriteJdOrder(order *model.GoodsOrder, delOldFirs if delOldFirst { db.Raw("DELETE FROM jdorder2 WHERE jdorderid = ?", utils.Str2Int64(order.VendorOrderID)).Exec() } - legacyOrder := &legacyorder.Jdorder2{ + legacyOrder := &legacymodel.Jdorder2{ Code: "0", Jdorderid: utils.Str2Int64(order.VendorOrderID), Orderstatus: int(utils.Str2Int64(order.VendorStatus)), @@ -31,7 +31,7 @@ func (c *OrderController) legacyWriteJdOrder(order *model.GoodsOrder, delOldFirs func (c *OrderController) legacyJdOrderStatusChanged(status *model.OrderStatus) (err error) { db := orm.NewOrm() - legacyOrder := &legacyorder.Jdorder2{ + legacyOrder := &legacymodel.Jdorder2{ Jdorderid: utils.Str2Int64(status.VendorOrderID), } diff --git a/business/controller/order_legacy.go b/business/controller/order_legacy.go index 07b5afd59..e81feb5a7 100644 --- a/business/controller/order_legacy.go +++ b/business/controller/order_legacy.go @@ -6,7 +6,7 @@ import ( "git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" - "git.rosy.net.cn/jx-callback/business/legacyorder" + "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/orm" @@ -136,7 +136,7 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm db.Raw("DELETE FROM "+globals.JxorderskuTableName+" WHERE order_id = ?", utils.Str2Int64(order.VendorOrderID)) } - jxorder := &legacyorder.Jxorder2{ + jxorder := &legacymodel.Jxorder2{ VenderId: int8(order.VendorID), OrderId: utils.Str2Int64(order.VendorOrderID), JxStoreId: utils.Int2Str(jxutils.GetJxStoreIDFromOrder(order)), @@ -213,7 +213,7 @@ func (c *OrderController) legacyJxOrderStatusChanged(status *model.OrderStatus, if db == nil { db = orm.NewOrm() } - jxorder := &legacyorder.Jxorder2{ + jxorder := &legacymodel.Jxorder2{ OrderId: utils.Str2Int64(status.VendorOrderID), } if err = db.Read(jxorder, "OrderId"); err == nil { @@ -250,7 +250,7 @@ func (c *WaybillController) legacyWaybillStatusChanged(bill *model.Waybill, db o if db == nil { db = orm.NewOrm() } - jxorder := &legacyorder.Jxorder2{ + jxorder := &legacymodel.Jxorder2{ OrderId: utils.Str2Int64(bill.VendorOrderID), } if err = db.Read(jxorder, "OrderId"); err == nil { diff --git a/business/legacymodel/blackclient.go b/business/legacymodel/blackclient.go new file mode 100644 index 000000000..439c477f2 --- /dev/null +++ b/business/legacymodel/blackclient.go @@ -0,0 +1,12 @@ +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/legacy/models/config.go b/business/legacymodel/config.go similarity index 88% rename from legacy/models/config.go rename to business/legacymodel/config.go index 30340a393..8137ac40d 100644 --- a/legacy/models/config.go +++ b/business/legacymodel/config.go @@ -1,4 +1,4 @@ -package models +package legacymodel type Config struct { Id int diff --git a/business/legacyorder/elemeorder.go b/business/legacymodel/elemeorder.go similarity index 96% rename from business/legacyorder/elemeorder.go rename to business/legacymodel/elemeorder.go index 98a5f778f..8ba70dc87 100644 --- a/business/legacyorder/elemeorder.go +++ b/business/legacymodel/elemeorder.go @@ -1,4 +1,4 @@ -package legacyorder +package legacymodel import "git.rosy.net.cn/jx-callback/globals" diff --git a/business/legacyorder/jdorder.go b/business/legacymodel/jdorder.go similarity index 97% rename from business/legacyorder/jdorder.go rename to business/legacymodel/jdorder.go index 76d8bd05e..947c10033 100644 --- a/business/legacyorder/jdorder.go +++ b/business/legacymodel/jdorder.go @@ -1,4 +1,4 @@ -package legacyorder +package legacymodel import ( "git.rosy.net.cn/jx-callback/globals" diff --git a/business/legacyorder/jxorder.go b/business/legacymodel/jxorder.go similarity index 99% rename from business/legacyorder/jxorder.go rename to business/legacymodel/jxorder.go index 3309850e5..a7aed3f9a 100644 --- a/business/legacyorder/jxorder.go +++ b/business/legacymodel/jxorder.go @@ -1,4 +1,4 @@ -package legacyorder +package legacymodel import "git.rosy.net.cn/jx-callback/globals" diff --git a/business/legacyorder/jxordersku.go b/business/legacymodel/jxordersku.go similarity index 97% rename from business/legacyorder/jxordersku.go rename to business/legacymodel/jxordersku.go index dd63506f9..4880cdf0a 100644 --- a/business/legacyorder/jxordersku.go +++ b/business/legacymodel/jxordersku.go @@ -1,4 +1,4 @@ -package legacyorder +package legacymodel import "git.rosy.net.cn/jx-callback/globals" diff --git a/business/scheduler/defsch/defsch.go b/business/scheduler/defsch/defsch.go index 80b538471..c1df60a14 100644 --- a/business/scheduler/defsch/defsch.go +++ b/business/scheduler/defsch/defsch.go @@ -7,10 +7,10 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/scheduler" "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/jx-callback/legacy/models" "github.com/astaxie/beego/orm" ) @@ -334,7 +334,7 @@ func (s *DefScheduler) handleAutoAcceptOrder(orderID string, vendorID int, userM if db == nil { db = orm.NewOrm() } - user := &models.BlackClient{ + user := &legacymodel.BlackClient{ Mobile: userMobile, } if err := db.Read(user, "Mobile"); err != nil { diff --git a/globals/db/db.go b/globals/db/db.go index 84a49b69f..d81f38729 100644 --- a/globals/db/db.go +++ b/globals/db/db.go @@ -1,7 +1,7 @@ package db import ( - "git.rosy.net.cn/jx-callback/business/legacyorder" + "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/legacy/models" @@ -16,6 +16,8 @@ func Init() { if globals.CallLegacyMsgHandler { models.RegisterModels() } + orm.RegisterModel(new(legacymodel.Config)) + orm.RegisterModel(new(legacymodel.BlackClient)) if globals.CallNewMsgHandler { orm.RegisterModel(new(model.GoodsOrder)) orm.RegisterModel(new(model.OrderSku)) @@ -24,10 +26,10 @@ func Init() { orm.RegisterModel(new(model.Jxstorefeature)) - orm.RegisterModel(new(legacyorder.Jxorder2)) - orm.RegisterModel(new(legacyorder.Jxordersku2)) - // orm.RegisterModel(new(legacyorder.Elemeorder2)) - // orm.RegisterModel(new(legacyorder.Jdorder2)) + orm.RegisterModel(new(legacymodel.Jxorder2)) + orm.RegisterModel(new(legacymodel.Jxordersku2)) + // orm.RegisterModel(new(legacymodel.Elemeorder2)) + // orm.RegisterModel(new(legacymodel.Jdorder2)) } // create table orm.RunSyncdb("default", false, true) diff --git a/legacy/controllers/business.go b/legacy/controllers/business.go index af4a45214..8130c4505 100644 --- a/legacy/controllers/business.go +++ b/legacy/controllers/business.go @@ -1,8 +1,8 @@ package controllers import ( + "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/jx-callback/legacy/models" "github.com/astaxie/beego/orm" ) @@ -17,7 +17,7 @@ func OnNewOrder(orderID string, vendorID int, userMobile string, jxStoreID int, if db == nil { db = orm.NewOrm() } - user := &models.BlackClient{ + user := &legacymodel.BlackClient{ Mobile: userMobile, } if err := db.Read(user, "Mobile"); err != nil { diff --git a/legacy/models/models.go b/legacy/models/models.go index 9046974c8..245973bc2 100644 --- a/legacy/models/models.go +++ b/legacy/models/models.go @@ -1,26 +1,13 @@ package models import ( - "time" - elmmodels "git.rosy.net.cn/jx-callback/legacy/elm/models" jdmodels "git.rosy.net.cn/jx-callback/legacy/jd/models" "github.com/astaxie/beego/orm" ) -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"` -} - func RegisterModels() { // register model orm.RegisterModel(new(jdmodels.Jdorder)) orm.RegisterModel(new(elmmodels.ELMOrder)) - orm.RegisterModel(new(Config)) - orm.RegisterModel(new(BlackClient)) } diff --git a/legacy/tasks/configrefresh.go b/legacy/tasks/configrefresh.go index 5da80d66e..608907b7a 100644 --- a/legacy/tasks/configrefresh.go +++ b/legacy/tasks/configrefresh.go @@ -4,13 +4,13 @@ import ( "fmt" "time" + "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/legacy/freshfood" - "git.rosy.net.cn/jx-callback/legacy/models" "github.com/astaxie/beego/orm" ) @@ -37,7 +37,7 @@ func RefreshConfig(configKey string, expiresTime time.Duration, configGetter fun sleepGap = maxRefreshGap } refreshFunc := func() (string, error) { - curConfig := &models.Config{ + curConfig := &legacymodel.Config{ Thirdparty: configKey, } db := orm.NewOrm()