- 修复转自配送后收到运单接受消息处理错误问题

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -32,23 +32,20 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 				if err = s.isPossibleSwitch2SelfDelivery(order); err == nil {
 					err = s.cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
 					if err == nil {
-						// todo
-						if true { //order.DeliveryFlag&model.OrderDeliveryFlagMaskPurcahseDisabled == 0 {
-							if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
-								if order.Status <= model.OrderStatusFinishedPickup {
-									storeDetail, err2 := dao.GetStoreDetail(dao.GetDB(), order.StoreID, order.VendorID)
-									phone := userName
-									if err = err2; err == nil {
-										phone = storeDetail.Tel1
-									}
-									err = s.SelfDeliverDelivering(order, phone)
-								}
-							} else {
-								if order.Status <= model.OrderStatusFinishedPickup {
-									err = s.Swtich2SelfDeliver(order, userName)
-								} else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了
-									err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
+						if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
+							if order.Status <= model.OrderStatusFinishedPickup {
+								storeDetail, err2 := dao.GetStoreDetail(dao.GetDB(), order.StoreID, order.VendorID)
+								phone := userName
+								if err = err2; err == nil {
+									phone = storeDetail.Tel1
 								}
+								err = s.SelfDeliverDelivering(order, phone)
+							}
+						} else {
+							if order.Status <= model.OrderStatusFinishedPickup {
+								err = s.Swtich2SelfDeliver(order, userName)
+							} else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了
+								err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
 							}
 						}
 					}