- orderUseNewTable almost ok.

business/jxcallback/scheduler/defsch/defsch.go

@@ -12,6 +12,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"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/dao"
 	"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"
@@ -99,6 +100,39 @@ func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsO
 }
 
 func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Debugf("updateOrderStoreFeature orderID:%s", order.VendorOrderID)
+	if globals.OrderUseNewTable {
+		jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
+		if jxStoreID > 0 {
+			db := dao.GetDB()
+			storeMap, err2 := dao.GetStoreMapByStoreID(db, jxStoreID, order.VendorID)
+			if err = err2; err != nil {
+				return err
+			}
+			s.autoPickupTimeoutMinute = int(storeMap.AutoPickup)
+			s.storeDeliveryType = int(storeMap.DeliveryType)
+			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)
+				if err = err2; err != nil {
+					return err
+				}
+				for _, v := range vendorList {
+					s.supported3rdCarriers = append(s.supported3rdCarriers, v.VendorID)
+				}
+				if len(s.supported3rdCarriers) == 0 {
+					isNeedSchedule = false
+				}
+			}
+			if !isNeedSchedule {
+				order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
+			}
+		}
+		return err
+	}
 	storefeature := &legacymodel2.Jxstorefeature{
 		Id: jxutils.GetJxStoreIDFromOrder(order),
 	}