liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-10 17:42:43 +08:00
parent a76e30bc35
commit acacc3b2de
1 changed files with 77 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
business/jxstore/report/report.go
View File

@@ -414,7 +414,13 @@ func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, f
dayCount = int(fromTimeT.Sub(toTimeT).Hours())/24 + 1 //查的几天 dayCount = int(fromTimeT.Sub(toTimeT).Hours())/24 + 1 //查的几天
getStoreManageStateResult []*GetStoreManageStateResult getStoreManageStateResult []*GetStoreManageStateResult
storeIDsPage []int storeIDsPage []int
storeMapMaps map[int]*model.StoreMap
) )
storeMapMaps = make(map[int]*model.StoreMap)
storeMaps, err := dao.GetStoresMapList(db, []int{vendorID}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
for _, v := range storeMaps {
storeMapMaps[v.StoreID] = v
}
//权限 //权限
if permission.IsRoled(ctx) { if permission.IsRoled(ctx) {
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
@@ -427,11 +433,9 @@ func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, f
} }
} else { } else {
for k, _ := range storeIDsMap { for k, _ := range storeIDsMap {
storeDetail, _ := dao.GetStoreDetail(db, k, vendorID, "") if storeMapMaps[k] != nil {
if storeDetail == nil || storeDetail.VendorStoreID == "" || storeDetail.VendorOrgCode == "" { storeIDs2 = append(storeIDs2, k)
continue
} }
storeIDs2 = append(storeIDs2, k)
} }
} }
storeIDs = nil storeIDs = nil
@@ -443,77 +447,79 @@ func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, f
index2 = len(storeIDs) - 1 index2 = len(storeIDs) - 1
} }
storeIDsPage = storeIDs[offset*pageSize : index2] storeIDsPage = storeIDs[offset*pageSize : index2]
task := tasksch.NewParallelTask("GetStoreManageState", tasksch.NewParallelConfig().SetParallelCount(20).SetIsContinueWhenError(true), ctx, for _, v := range storeIDsPage {
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // task := tasksch.NewParallelTask("GetStoreManageState", tasksch.NewParallelConfig().SetParallelCount(20).SetIsContinueWhenError(true), ctx,
v := batchItemList[0].(int) // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
storeDetail, _ := dao.GetStoreDetail(db, v, vendorID, "") // v := batchItemList[0].(int)
if storeDetail == nil || storeDetail.VendorStoreID == "" || storeDetail.VendorOrgCode == "" { storeDetail, _ := dao.GetStoreDetail(db, v, vendorID, "")
return retVal, err if storeDetail == nil || storeDetail.VendorStoreID == "" || storeDetail.VendorOrgCode == "" {
} continue
result := &GetStoreManageStateResult{ }
StoreID: v, result := &GetStoreManageStateResult{
StoreName: storeDetail.Name, StoreID: v,
MarketScale: storeDetail.MarketScale, StoreName: storeDetail.Name,
CoverArea: storeDetail.CoverArea, MarketScale: storeDetail.MarketScale,
} CoverArea: storeDetail.CoverArea,
//覆盖范围 }
if result.CoverArea == 0 { //覆盖范围
handler := partner.GetPurchasePlatformFromVendorID(vendorID) if result.CoverArea == 0 {
if store, err := handler.ReadStore(ctx, storeDetail.VendorOrgCode, storeDetail.VendorStoreID); err == nil {
if storeMaps, err := dao.GetStoresMapList(db, []int{vendorID}, []int{v}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", ""); len(storeMaps) > 0 && err == nil {
if vendorID == model.VendorIDJD && store.DeliveryRangeType != model.DeliveryRangeTypePolygon {
storeMaps[0].CoverArea = math.Pi * utils.Str2Float64WithDefault(store.DeliveryRange, 0) * utils.Str2Float64WithDefault(store.DeliveryRange, 0) / float64(10000)
} else {
storeMaps[0].CoverArea = CalculateCoverArea(strings.Split(store.DeliveryRange, ";"), vendorID)
}
dao.UpdateEntity(db, storeMaps[0], "CoverArea")
result.CoverArea = storeMaps[0].CoverArea
}
}
}
//营业时长
optime := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, time.Now()).Sub(jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now())).Hours()
if storeDetail.CloseTime2 != 0 && storeDetail.OpenTime2 != 0 {
optime += jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, time.Now()).Sub(jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now())).Hours()
}
result.OpenTime = optime * float64(dayCount)
//商品数
highSkuCount := 0
storeSkus, _ := dao.GetStoresSkusForManageState(db, v, model.StoreSkuBindStatusNormal)
for _, v := range storeSkus {
if v.UnitPrice > v.MidUnitPrice {
highSkuCount++
}
}
result.SkuCount, result.HighSkuCount = len(storeSkus), highSkuCount
//活动丰富度
handler := partner.GetPurchasePlatformFromVendorID(vendorID) handler := partner.GetPurchasePlatformFromVendorID(vendorID)
ample, _ := handler.GetActAmple(ctx, storeDetail.VendorStoreID, storeDetail.VendorStoreID) if store, err := handler.ReadStore(ctx, storeDetail.VendorOrgCode, storeDetail.VendorStoreID); err == nil {
result.ActAmple = ample if storeMapMaps[v] != nil {
//订单 if vendorID == model.VendorIDJD && store.DeliveryRangeType != model.DeliveryRangeTypePolygon {
refuseOrderCount := 0 storeMapMaps[v].CoverArea = math.Pi * utils.Str2Float64WithDefault(store.DeliveryRange, 0) * utils.Str2Float64WithDefault(store.DeliveryRange, 0) / float64(10000)
orderList, err := dao.QueryOrdersForManageState(db, v, vendorID, model.OrderStatusCanceled, fromTimeT, toTimeT) } else {
for _, v := range orderList { storeMapMaps[v].CoverArea = CalculateCoverArea(strings.Split(store.DeliveryRange, ";"), vendorID)
if v.BindID == 0 { }
refuseOrderCount++ dao.UpdateEntity(db, storeMapMaps[v], "CoverArea")
result.CoverArea = storeMapMaps[v].CoverArea
} }
} }
result.NullOrderCount, result.RefuseOrderCount = len(orderList), refuseOrderCount }
//评分（美团） //营业时长
if vendorID == model.VendorIDMTWM { optime := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, time.Now()).Sub(jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now())).Hours()
mtapi := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, storeDetail.VendorOrgCode).(*mtwmapi.API) if storeDetail.CloseTime2 != 0 && storeDetail.OpenTime2 != 0 {
if scoreResult, err := mtapi.CommentScore(storeDetail.VendorStoreID); err == nil { optime += jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, time.Now()).Sub(jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now())).Hours()
result.StoreScore = scoreResult.AvgPoiScore }
} result.OpenTime = optime * float64(dayCount)
//商品数
highSkuCount := 0
storeSkus, _ := dao.GetStoresSkusForManageState(db, v, model.StoreSkuBindStatusNormal)
for _, v := range storeSkus {
if v.UnitPrice > v.MidUnitPrice {
highSkuCount++
} }
retVal = []*GetStoreManageStateResult{result} }
// getStoreManageStateResult = append(getStoreManageStateResult, result) result.SkuCount, result.HighSkuCount = len(storeSkus), highSkuCount
return retVal, err //活动丰富度
}, storeIDsPage) handler := partner.GetPurchasePlatformFromVendorID(vendorID)
tasksch.HandleTask(task, nil, true).Run() ample, _ := handler.GetActAmple(ctx, storeDetail.VendorStoreID, storeDetail.VendorStoreID)
result, _ := task.GetResult(0) result.ActAmple = ample
for _, v := range result { //订单
getStoreManageStateResult = append(getStoreManageStateResult, v.(*GetStoreManageStateResult)) refuseOrderCount := 0
orderList, _ := dao.QueryOrdersForManageState(db, v, vendorID, model.OrderStatusCanceled, fromTimeT, toTimeT)
for _, v := range orderList {
if v.BindID == 0 {
refuseOrderCount++
}
}
result.NullOrderCount, result.RefuseOrderCount = len(orderList), refuseOrderCount
//评分（美团）
if vendorID == model.VendorIDMTWM {
mtapi := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, storeDetail.VendorOrgCode).(*mtwmapi.API)
if scoreResult, err := mtapi.CommentScore(storeDetail.VendorStoreID); err == nil {
result.StoreScore = scoreResult.AvgPoiScore
}
}
// retVal = []*GetStoreManageStateResult{result}
// getStoreManageStateResult = append(getStoreManageStateResult, result)
// return retVal, err
// }, storeIDsPage)
// tasksch.HandleTask(task, nil, true).Run()
// result, _ := task.GetResult(0)
// for _, v := range result {
// getStoreManageStateResult = append(getStoreManageStateResult, v.(*GetStoreManageStateResult))
// }
} }
return &model.PagedInfo{ return &model.PagedInfo{
TotalCount: len(storeIDs), TotalCount: len(storeIDs),