aa

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -143,7 +143,7 @@ func (c *BaseScheduler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOr
 		if globals.IsAddEvent {
 			err = cms.AddEventDetail(dao.GetDB(), ctx, model.OperateUpdate, order.StoreID, model.ThingTypeOrder, order.StoreID, order.VendorOrderID, order.StoreName)
 		}
-		err = partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).CancelOrder(ctx, order, reason)
+		err = partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).CancelOrder(ctx, order, reason+","+ctx.GetUserName())
 	}
 	return err
 }

business/jxcallback/scheduler/defsch/defsch.go

@@ -853,7 +853,10 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 						}
 					}
 				}
-
+				//TODO 2021-02-19 增加品牌配送开关
+				if storeDetail.BrandIsOpen == model.YES {
+					err = fmt.Errorf("此品牌已关闭配送！ [%v]", storeDetail.BrandName)
+				}
 				if err == nil {
 					if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {
 						savedOrderInfo.retryCount++