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 {