|
@@ -1,5 +1,6 @@
|
|
|
package org.springblade.modules.api.controller;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.DesensitizedUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
@@ -10,6 +11,7 @@ import io.swagger.annotations.ApiParam;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springblade.common.constant.CommonConstant;
|
|
|
import org.springblade.common.enums.AuditStatusEnum;
|
|
|
+import org.springblade.common.enums.FacilityStatusEnum;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
import org.springblade.core.mp.support.Query;
|
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
@@ -26,6 +28,10 @@ import org.springblade.modules.api.vo.MerchantIncomeVO;
|
|
|
import org.springblade.modules.api.vo.PageMemberVO;
|
|
|
import org.springblade.modules.auth.enums.UserEnum;
|
|
|
import org.springblade.modules.auth.utils.TokenUtil;
|
|
|
+import org.springblade.modules.business.entity.Facility;
|
|
|
+import org.springblade.modules.business.service.IFacilityService;
|
|
|
+import org.springblade.modules.business.service.IShopService;
|
|
|
+import org.springblade.modules.finance.service.IOrderGoodsService;
|
|
|
import org.springblade.modules.system.entity.User;
|
|
|
import org.springblade.modules.system.entity.UserMerchant;
|
|
|
import org.springblade.modules.system.service.IUserMerchantService;
|
|
@@ -40,6 +46,7 @@ import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* Author pangqijun
|
|
@@ -54,6 +61,9 @@ public class ApiMerchantUserController {
|
|
|
|
|
|
private final IUserMerchantService iUserMerchantService;
|
|
|
private final IUserService iUserService;
|
|
|
+ private final IOrderGoodsService orderGoodsService;
|
|
|
+ private final IFacilityService facilityService;
|
|
|
+ private final IShopService shopService;
|
|
|
|
|
|
@GetMapping("/merchant/get")
|
|
|
@ApiOperationSupport(order = 1)
|
|
@@ -157,7 +167,7 @@ public class ApiMerchantUserController {
|
|
|
@ApiOperationSupport(order = 7)
|
|
|
@ApiOperation(value = "可提现金额", notes = "可提现金额")
|
|
|
public R cash() {
|
|
|
- return R.data( iUserMerchantService.getCash());
|
|
|
+ return R.data(iUserMerchantService.getCash());
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -235,14 +245,28 @@ public class ApiMerchantUserController {
|
|
|
@ApiOperationSupport(order = 9)
|
|
|
@ApiOperation(value = "商家端-首页-设备状态", notes = "商家端-首页-设备状态")
|
|
|
public R<Map<String, String>> survey() {
|
|
|
+
|
|
|
+ Long userId = AuthUtil.getUserId();
|
|
|
+
|
|
|
//key为名称,value为数量
|
|
|
Map<String, String> result = new HashMap<>();
|
|
|
- result.put("设备数量", "60");
|
|
|
- result.put("门店数量", "6");
|
|
|
- result.put("故障设备", "10");
|
|
|
- result.put("在线设备", "40");
|
|
|
- result.put("子账号", "6");
|
|
|
- result.put("订单量", "600");
|
|
|
+
|
|
|
+ result.put("门店数量", shopService.getShopNum(userId));
|
|
|
+
|
|
|
+ List<Facility> facilityNum = facilityService.getFacilityNum(userId);
|
|
|
+ if (CollectionUtil.isNotEmpty(facilityNum)) {
|
|
|
+ result.put("设备数量", facilityNum.size() + "");
|
|
|
+ //按状态分组
|
|
|
+ Map<Integer, List<Facility>> collect = facilityNum.stream().collect(Collectors.groupingBy(Facility::getFacilityStatus));
|
|
|
+ result.put("故障设备", CollectionUtil.isNotEmpty(collect.get(FacilityStatusEnum.FAULT.getValue())) ? collect.get(FacilityStatusEnum.FAULT.getValue()).size() + "" : "0");
|
|
|
+ result.put("在线设备", CollectionUtil.isNotEmpty(collect.get(FacilityStatusEnum.ON_LINE.getValue())) ? collect.get(FacilityStatusEnum.ON_LINE.getValue()).size() + "" : "0");
|
|
|
+ } else {
|
|
|
+ result.put("设备数量", "0");
|
|
|
+ result.put("故障设备", "0");
|
|
|
+ result.put("在线设备", "0");
|
|
|
+ }
|
|
|
+ result.put("子账号", iUserMerchantService.getChildNum(userId));
|
|
|
+ result.put("订单量", orderGoodsService.getMerchantOrderNum(userId));
|
|
|
return R.data(result);
|
|
|
}
|
|
|
|