添加美团服务商配置,修改抖音自动获取品牌
This commit is contained in:
@@ -882,9 +882,27 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
||||
if toTime.Sub(fromTime).Hours() > 24 {
|
||||
isLongTime = true
|
||||
}
|
||||
|
||||
if len(storeIDList) >= 2 {
|
||||
globals.SugarLogger.Errorf("GetStoresOrderSaleInfoNew err : [%v]", storeIDList)
|
||||
}
|
||||
|
||||
// 获取门店绑定美团的详情,是否为服务商.
|
||||
// 如果是服务商将不再统计美团的订单!其他平台正常统计!
|
||||
storeMapList, err := dao.GetStoresMapList2(db, []int{model.VendorIDMTWM}, storeIDList, nil, model.StoreStatusAll, 0, "", "", "", false)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
isService := 0
|
||||
if len(storeMapList) > 0 {
|
||||
for _, v := range storeMapList {
|
||||
isService = v.IsService
|
||||
}
|
||||
}
|
||||
|
||||
orderIDMap := make(map[string]struct{})
|
||||
var vendorOrderIDs []string
|
||||
orderSkuList, err := dao.GetStoreOrderSkuList(db, storeIDList, fromTime, toTime, statusList, true)
|
||||
orderSkuList, err := dao.GetStoreOrderSkuList(db, storeIDList, fromTime, toTime, statusList, true, isService)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -900,13 +918,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
||||
afsSkuList, err = dao.GetStoreAfsOrderSkuList2(db, vendorOrderIDs)
|
||||
orderSkuList4Afs, err = dao.GetStoreOrderSkuList4Afs2(db, vendorOrderIDs)
|
||||
}
|
||||
//afsSkuList, err := dao.GetStoreAfsOrderSkuList(db, storeIDList, fromTime, toTime, []int{model.AfsOrderStatusFinished}, true)
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
|
||||
orderSkuHandler := func(skuList []*dao.OrderSkuWithActualPayPrice) (orderMap map[string]*model.GoodsOrder, orderSkuMap map[string]*dao.OrderSkuWithActualPayPrice, saleInfoMap map[int64]*dao.StoresOrderSaleInfo) {
|
||||
orderMap = make(map[string]*model.GoodsOrder)
|
||||
orderSkuMap = make(map[string]*dao.OrderSkuWithActualPayPrice)
|
||||
|
||||
Reference in New Issue
Block a user