aa

business/jxstore/report/report.go

@@ -478,39 +478,27 @@ func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, f
 			}
 			result.OpenTime = optime * float64(dayCount)
 			//商品数
-			skuCount, highSkuCount := 0, 0
-			dao.GetStoresSkusInfo(db, storeIDs, skuIDs)
-			storeSkus, _ := dao.GetStoresSkusInfo(db, []int{v}, nil)
+			highSkuCount := 0
+			storeSkus, _ := dao.GetStoresSkusForManageState(db, v, model.StoreSkuBindStatusNormal)
 			for _, v := range storeSkus {
-				if v.Status == model.StoreSkuBindStatusNormal && v.Stock > 0 {
-					skuCount++
-					if priceRefer, err := dao.GetPriceReferPrice(db, 0, v.SkuID, utils.Time2Date(time.Now().AddDate(0, 0, -1))); err == nil && priceRefer != nil {
-						if v.UnitPrice > priceRefer.MidUnitPrice {
-							highSkuCount++
-						}
-					}
+				if v.UnitPrice > v.MidUnitPrice {
+					highSkuCount++
 				}
 			}
-			result.SkuCount, result.HighSkuCount = skuCount, highSkuCount
+			result.SkuCount, result.HighSkuCount = len(storeSkus), highSkuCount
 			//活动丰富度
 			handler := partner.GetPurchasePlatformFromVendorID(vendorID)
 			ample, _ := handler.GetActAmple(ctx, storeDetail.VendorStoreID, storeDetail.VendorStoreID)
 			result.ActAmple = ample
 			//订单
-			nullOrderCount, refuseOrderCount := 0, 0
-			if orderList, err := dao.QueryOrders(db, "", 0, []int{vendorID}, v, fromTimeT, toTimeT); err == nil {
-				for _, v := range orderList {
-					if v.Status == model.OrderStatusCanceled {
-						nullOrderCount++
-					}
-					if waybills, err2 := dao.GetWayBillByOrderID(db, 0, vendorID, 0, v.VendorOrderID); err2 == nil {
-						if len(waybills) == 0 {
-							refuseOrderCount++
-						}
-					}
+			refuseOrderCount := 0
+			orderList, err := dao.QueryOrdersForManageState(db, v, vendorID, model.OrderStatusCanceled, fromTimeT, toTimeT)
+			for _, v := range orderList {
+				if v.BindID == 0 {
+					refuseOrderCount++
 				}
 			}
-			result.NullOrderCount, result.RefuseOrderCount = nullOrderCount, refuseOrderCount
+			result.NullOrderCount, result.RefuseOrderCount = len(orderList), refuseOrderCount
 			//评分（美团）
 			if vendorID == model.VendorIDMTWM {
 				mtapi := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, storeDetail.VendorOrgCode).(*mtwmapi.API)