- order.DeliveryFlag added.

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -0,0 +1,55 @@
+package defsch
+
+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/partner"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+func (s *DefScheduler) SelfDeliveringAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) {
+	globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
+	status := &model.OrderStatus{
+		VendorOrderID: vendorOrderID,
+		VendorID:      vendorID,
+	}
+	savedOrderInfo := s.loadSavedOrderFromMap(status, false)
+	if savedOrderInfo != nil {
+		order := savedOrderInfo.order
+		err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
+		if err == nil {
+			if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
+				if order.Status <= model.OrderStatusFinishedPickup {
+					err = s.SelfDeliverDelievering(order, "")
+				}
+			} else {
+				if order.Status <= model.OrderStatusFinishedPickup {
+					err = s.Swtich2SelfDeliver(order, userName)
+				} else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了
+					err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
+				}
+			}
+		}
+		if err == nil {
+			order.Status = model.OrderStatusDelivering
+			order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled | model.OrderDeliveryFlagMaskPurcahseDisabled
+			if err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order); err == nil {
+				s.stopTimer(savedOrderInfo)
+				globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s successfully", vendorOrderID, userName)
+				return err
+			}
+		}
+	} else {
+		err = scheduler.ErrCanNotFindOrder
+	}
+	globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
+	return err
+}
+
+func (s *DefScheduler) SelfDeliveringAndUpdateStatusExt(vendorOrderID string, vendorID int, userName string) (err error) {
+	jxutils.CallMsgHandler(func() {
+		err = s.SelfDeliveringAndUpdateStatus(vendorOrderID, vendorID, userName)
+	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
+	return err
+}