|
@@ -4,13 +4,11 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.izouma.nineth.domain.Order;
|
|
import com.izouma.nineth.domain.Order;
|
|
|
import com.izouma.nineth.domain.User;
|
|
import com.izouma.nineth.domain.User;
|
|
|
-import com.izouma.nineth.enums.AuthorityName;
|
|
|
|
|
import com.izouma.nineth.enums.CollectionSource;
|
|
import com.izouma.nineth.enums.CollectionSource;
|
|
|
import com.izouma.nineth.enums.OrderStatus;
|
|
import com.izouma.nineth.enums.OrderStatus;
|
|
|
import com.izouma.nineth.repo.OrderRepo;
|
|
import com.izouma.nineth.repo.OrderRepo;
|
|
|
import com.izouma.nineth.repo.TokenHistoryRepo;
|
|
import com.izouma.nineth.repo.TokenHistoryRepo;
|
|
|
import com.izouma.nineth.repo.UserRepo;
|
|
import com.izouma.nineth.repo.UserRepo;
|
|
|
-import com.izouma.nineth.security.Authority;
|
|
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
@@ -35,7 +33,7 @@ public class StatisticService {
|
|
|
public Map<String, Object> total() {
|
|
public Map<String, Object> total() {
|
|
|
Map<String, Object> total = new HashMap<>();
|
|
Map<String, Object> total = new HashMap<>();
|
|
|
|
|
|
|
|
- long user = userRepo.countAllByAuthoritiesContainsAndDelFalse(Authority.get(AuthorityName.ROLE_USER));
|
|
|
|
|
|
|
+ long user = userRepo.countAllByDelFalse();
|
|
|
total.put("userNum", user);
|
|
total.put("userNum", user);
|
|
|
|
|
|
|
|
List<Order> orders = orderRepo.findAllByStatus(OrderStatus.FINISH);
|
|
List<Order> orders = orderRepo.findAllByStatus(OrderStatus.FINISH);
|