aa

business/jxcallback/orderman/order.go

@@ -342,16 +342,18 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
 				baseapi.SugarLogger.Infof("saveOrder duplicated orderid:%s msg received", order.VendorOrderID)
 			}
 		}
-		//修改商品库存
-		if err == nil {
-			err = ModifyOrderSkusStock(db, order, false)
-		}
 	} else {
 		globals.SugarLogger.Warnf("saveOrder create order:%v, error:%v", order, err)
 	}
 	if err == nil {
 		dao.Commit(db)
 	}
+	//修改商品库存
+	if err == nil {
+		utils.CallFuncAsync(func() {
+			err = ModifyOrderSkusStock(db, order, false)
+		})
+	}
 	return isDuplicated, err
 }
 

business/jxcallback/orderman/orderman_ext.go

@@ -332,6 +332,29 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 		func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
 			switch step {
 			case 0:
+				//权限
+				if permission.IsRoled(ctx) {
+					if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
+						var storeIDs2 []int
+						if mapParams["storeIDs"] != nil {
+							var storeIDs []int
+							if err = utils.UnmarshalUseNumber([]byte(mapParams["storeIDs"].(string)), &storeIDs); err == nil {
+								for _, v := range storeIDs {
+									if storeIDsMap[v] != 0 {
+										storeIDs2 = append(storeIDs2, v)
+									}
+								}
+							}
+						} else {
+							for k, _ := range storeIDsMap {
+								storeIDs2 = append(storeIDs2, k)
+							}
+						}
+						if data, err := json.Marshal(storeIDs2); err == nil {
+							mapParams["storeIDs"] = string(data)
+						}
+					}
+				}
 				orders, _, err = dao.GetOrders(dao.GetDB(), nil, true, true, fromDateStr, toDateStr, true, nil, false, "", mapParams, 0, model.UnlimitedPageSize)
 				globals.SugarLogger.Debugf("orders:%d, er:%v", len(orders), err)
 			case 1:

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++