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

- OrderUseNewTable

Browse Source
This commit is contained in:
gazebo
2018-10-17 14:33:47 +08:00
parent 9f3624c777
commit 9c125a61a0
9 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -4,7 +4,8 @@ import (
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/legacymodel"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/model/legacymodel2"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/orm"
@@ -68,8 +69,15 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(vendorOrderID string, vendorI
return err
}
func getStoreDeliveryType(order *model.GoodsOrder) int {
storefeature := &legacymodel.Jxstorefeature{
func getStoreDeliveryType(order *model.GoodsOrder) (deliveryType int) {
if globals.OrderUseNewTable {
deliveryType = scheduler.StoreDeliveryTypeByPlatform // 缺省值
if storeMap := dao.GetStoreMapByStoreID(nil, jxutils.GetJxStoreIDFromOrder(order), order.VendorID); storeMap != nil {
deliveryType = int(storeMap.DeliveryType)
}
return deliveryType
}
storefeature := &legacymodel2.Jxstorefeature{
Id: jxutils.GetJxStoreIDFromOrder(order),
}
if storefeature.Id != 0 {

3
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -13,6 +13,7 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/legacymodel"
"git.rosy.net.cn/jx-callback/business/model/legacymodel2"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/orm"
@@ -98,7 +99,7 @@ func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsO
}
func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err error) {
storefeature := &legacymodel.Jxstorefeature{
storefeature := &legacymodel2.Jxstorefeature{
Id: jxutils.GetJxStoreIDFromOrder(order),
}
if storefeature.Id > 0 {

17
business/model/dao/dao_bz.go
View File

@@ -7,6 +7,7 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/orm"
)
@@ -137,3 +138,19 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
}
return err
}
func GetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model.StoreMap) {
if db == nil {
db = GetDB()
}
storeMap = &model.StoreMap{
StoreID: storeID,
VendorID: vendorID,
}
storeMap.DeletedAt = utils.DefaultTimeValue
if err := GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, model.FieldDeletedAt); err != nil {
globals.SugarLogger.Warnf("getStoreDeliveryType read storefeature failed with error:%v", err)
return nil
}
return storeMap
}

2
business/model/legacymodel2/elemeorder.go
View File

@@ -1,4 +1,4 @@
package legacymodel
package legacymodel2
type Elemeorder struct {
Id int `orm:"column(id);auto"`

2
business/model/legacymodel2/jdorder.go
View File

@@ -1,4 +1,4 @@
package legacymodel
package legacymodel2
type Jdorder struct {
Id int `orm:"column(id);auto"`

2
business/model/legacymodel2/jxorder.go
View File

@@ -1,4 +1,4 @@
package legacymodel
package legacymodel2
type Jxorder struct {
Id int `orm:"column(id);auto"`

2
business/model/legacymodel2/jxordersku.go
View File

@@ -1,4 +1,4 @@
package legacymodel
package legacymodel2
type Jxordersku struct {
Id int `orm:"column(id);auto"`

2
business/model/legacymodel2/jxstorefeature.go
View File

@@ -1,4 +1,4 @@
package legacymodel
package legacymodel2
type Jxstorefeature struct {
Id int `orm:"column(storeid);pk"`

5
globals/beegodb/beegodb.go
View File

@@ -3,6 +3,7 @@ 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/business/model/legacymodel2"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego"
"github.com/astaxie/beego/orm"
@@ -15,7 +16,9 @@ func Init() {
orm.RegisterModel(new(legacymodel.BlackClient))
orm.RegisterModel(new(legacymodel.JxBadComments))
orm.RegisterModel(new(legacymodel.StoreBill))
orm.RegisterModel(new(legacymodel.Jxstorefeature))
if !globals.OrderUseNewTable {
orm.RegisterModel(new(legacymodel2.Jxstorefeature))
}
orm.RegisterModel(new(legacymodel.TempLog))
orm.RegisterModel(new(legacymodel.WeiXins), new(legacymodel.JxBackendUser))