- refactor order deliveryType

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -8,10 +8,8 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"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"
 )
 
 func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (bills []*model.Waybill, err error) {
@@ -41,7 +39,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
 	globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
 	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
 	if err == nil {
-		if getStoreDeliveryType(order) == scheduler.StoreDeliveryTypeByStore {
+		if GetStoreDeliveryType(order, nil) == scheduler.StoreDeliveryTypeByStore {
 			err = c.SelfDeliverDelievered(order, userName)
 		} else {
 			err = c.Swtich2SelfDelivered(order, userName)
@@ -75,28 +73,21 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo
 	return err
 }
 
-func getStoreDeliveryType(order *model.GoodsOrder) (deliveryType int) {
+func GetStoreDeliveryType(order *model.GoodsOrder, storeMap *model.StoreMap) (deliveryType int) {
 	jxStoreID := jxutils.GetSaleStoreIDFromOrder(order)
-	if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID {
-		deliveryType = scheduler.StoreDeliveryTypeByPlatform // 缺省值
-		if storeMap, _ := dao.GetStoreMapByStoreID(nil, jxStoreID, order.VendorID); storeMap != nil {
-			deliveryType = int(storeMap.DeliveryType)
-		}
-		return deliveryType
+	if storeMap == nil {
+		storeMap, _ = dao.FakeGetStoreMapByStoreID(nil, jxStoreID, order.VendorID)
 	}
-	storefeature := &legacymodel2.Jxstorefeature{
-		Id: jxStoreID,
-	}
-	if storefeature.Id != 0 {
-		db := orm.NewOrm()
-		err := db.Read(storefeature, "Id")
-		if err == nil {
-			if order.VendorID == model.VendorIDJD {
-				return int(storefeature.JdDeliveryType)
+
+	deliveryType = scheduler.StoreDeliveryTypeByPlatform // 缺省值
+	if storeMap != nil {
+		deliveryType = int(storeMap.DeliveryType)
+		// 微盟订单，要确认有绑达达，才能是非自送的
+		if order.VendorID == model.VendorIDWSC && deliveryType != scheduler.StoreDeliveryTypeByStore {
+			if courierMapList, _ := dao.GetOpenedStoreCouriersByStoreID(nil, jxStoreID, model.VendorIDDada); len(courierMapList) > 0 {
+				deliveryType = scheduler.StoreDeliveryTypeByStore
 			}
-			return int(storefeature.ElmDeliveryType)
 		}
-		globals.SugarLogger.Infof("getStoreDeliveryType read storefeature failed with error:%v", err)
 	}
-	return scheduler.StoreDeliveryTypeByPlatform
+	return deliveryType
 }

business/jxcallback/scheduler/defsch/defsch.go

@@ -110,23 +110,26 @@ func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err e
 	if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID {
 		if jxStoreID > 0 {
 			db := dao.GetDB()
-			storeMap, err2 := dao.GetStoreMapByStoreID(db, jxStoreID, order.VendorID)
+			storeMap, err2 := dao.FakeGetStoreMapByStoreID(db, jxStoreID, order.VendorID)
 			if err = err2; err != nil {
 				return err
 			}
 			s.autoPickupTimeoutMinute = int(storeMap.AutoPickup)
-			s.storeDeliveryType = int(storeMap.DeliveryType)
+			s.storeDeliveryType = basesch.GetStoreDeliveryType(order, storeMap)
 			if s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
 				order.DeliveryFlag |= model.OrderDeliveryFlagMaskPurcahseDisabled
 			}
 			isNeedSchedule := s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore || storeMap.DeliveryCompetition != 0
 			if isNeedSchedule {
-				vendorList, err2 := dao.GetStoreCouriersByStoreID(db, jxStoreID, -1)
+				vendorList, err2 := dao.GetOpenedStoreCouriersByStoreID(db, jxStoreID, -1)
 				if err = err2; err != nil {
 					return err
 				}
 				for _, v := range vendorList {
-					s.supported3rdCarriers = append(s.supported3rdCarriers, v.VendorID)
+					// 达达作为微商城的自有配送，不参与竞争配送
+					if !(order.VendorID == model.VendorIDWSC && v.VendorID == model.VendorIDDada) {
+						s.supported3rdCarriers = append(s.supported3rdCarriers, v.VendorID)
+					}
 				}
 				if len(s.supported3rdCarriers) == 0 {
 					isNeedSchedule = false

business/jxcallback/scheduler/scheduler.go

@@ -9,7 +9,7 @@ import (
 const (
 	StoreDeliveryTypeCrowdSourcing = 0 //缺省，平台众包配送，可转自送
 	StoreDeliveryTypeByPlatform    = 1 //平台专送
-	StoreDeliveryTypeByStore       = 2 //完全门店自送
+	StoreDeliveryTypeByStore       = 2 //完全门店自送，这个表示的意思是平台的门店属性（就是购物平台不负责配送），而不是真正是否是老板自己送
 )
 
 const (