liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- refactor model register.

Browse Source
This commit is contained in:
gazebo
2018-07-24 09:46:30 +08:00
parent 3439ef3669
commit de21819f71
14 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/controller/elm/order_legacy.go
View File

@@ -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 {

6
business/controller/jd/order_legacy.go
View File

@@ -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),
}

8
business/controller/order_legacy.go
View File

@@ -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 {

12
business/legacymodel/blackclient.go Normal file
View File

@@ -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"`
}

2
legacy/models/config.go → business/legacymodel/config.go
View File

@@ -1,4 +1,4 @@
package models
package legacymodel
type Config struct {
Id int

2
business/legacyorder/elemeorder.go → business/legacymodel/elemeorder.go
View File

@@ -1,4 +1,4 @@
package legacyorder
package legacymodel
import "git.rosy.net.cn/jx-callback/globals"

2
business/legacyorder/jdorder.go → business/legacymodel/jdorder.go
View File

@@ -1,4 +1,4 @@
package legacyorder
package legacymodel
import (
"git.rosy.net.cn/jx-callback/globals"

2
business/legacyorder/jxorder.go → business/legacymodel/jxorder.go
View File

@@ -1,4 +1,4 @@
package legacyorder
package legacymodel
import "git.rosy.net.cn/jx-callback/globals"

2
business/legacyorder/jxordersku.go → business/legacymodel/jxordersku.go
View File

@@ -1,4 +1,4 @@
package legacyorder
package legacymodel
import "git.rosy.net.cn/jx-callback/globals"

4
business/scheduler/defsch/defsch.go
View File

@@ -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 {

12
globals/db/db.go
View File

@@ -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)

4
legacy/controllers/business.go
View File

@@ -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 {

13
legacy/models/models.go
View File

@@ -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))
}

4
legacy/tasks/configrefresh.go
View File

@@ -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()