diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index dfa579b24..a2629dcac 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -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 { diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 34d394afb..bd22503b9 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -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 { diff --git a/business/model/dao/dao_bz.go b/business/model/dao/dao_bz.go index 12c151b4f..0814d53c8 100644 --- a/business/model/dao/dao_bz.go +++ b/business/model/dao/dao_bz.go @@ -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 +} diff --git a/business/model/legacymodel2/elemeorder.go b/business/model/legacymodel2/elemeorder.go index 2b4ff0045..3e367bce8 100644 --- a/business/model/legacymodel2/elemeorder.go +++ b/business/model/legacymodel2/elemeorder.go @@ -1,4 +1,4 @@ -package legacymodel +package legacymodel2 type Elemeorder struct { Id int `orm:"column(id);auto"` diff --git a/business/model/legacymodel2/jdorder.go b/business/model/legacymodel2/jdorder.go index 0bd5c8787..aeb4b0e91 100644 --- a/business/model/legacymodel2/jdorder.go +++ b/business/model/legacymodel2/jdorder.go @@ -1,4 +1,4 @@ -package legacymodel +package legacymodel2 type Jdorder struct { Id int `orm:"column(id);auto"` diff --git a/business/model/legacymodel2/jxorder.go b/business/model/legacymodel2/jxorder.go index c26192115..1deffd1cc 100644 --- a/business/model/legacymodel2/jxorder.go +++ b/business/model/legacymodel2/jxorder.go @@ -1,4 +1,4 @@ -package legacymodel +package legacymodel2 type Jxorder struct { Id int `orm:"column(id);auto"` diff --git a/business/model/legacymodel2/jxordersku.go b/business/model/legacymodel2/jxordersku.go index 05048f72b..9df52a732 100644 --- a/business/model/legacymodel2/jxordersku.go +++ b/business/model/legacymodel2/jxordersku.go @@ -1,4 +1,4 @@ -package legacymodel +package legacymodel2 type Jxordersku struct { Id int `orm:"column(id);auto"` diff --git a/business/model/legacymodel2/jxstorefeature.go b/business/model/legacymodel2/jxstorefeature.go index 219fbc806..df8e7131f 100644 --- a/business/model/legacymodel2/jxstorefeature.go +++ b/business/model/legacymodel2/jxstorefeature.go @@ -1,4 +1,4 @@ -package legacymodel +package legacymodel2 type Jxstorefeature struct { Id int `orm:"column(storeid);pk"` diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index c7377eba6..933a4c409 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -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))