数据看板

ch-admin-api/src/main/java/com/wwdz/ch/admin/config/ShiroConfig.java

@@ -124,6 +124,7 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/admin/sysDistributionOrder/**", "anon");
 		filterChainDefinitionMap.put("/admin/imageCatelog/**", "anon");
 		filterChainDefinitionMap.put("/admin/identifyOrder/**", "anon");
+		filterChainDefinitionMap.put("/admin/dashboard/**", "anon");
 
 
 		filterChainDefinitionMap.put("/admin/invitationCode/**", "anon");

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminDashbordController.java

@@ -145,6 +145,9 @@ public class AdminDashbordController {
 
 	@PostMapping("/dataPanel")
 	public Result dataPanel(@RequestBody DataPanelRequestDto dto) {
+		if (dto.getType() == null) {
+			return Result.failed("时间范围为空");
+		}
 		return adminDashbordService.dataPanel(dto);
 	}
 

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminDashbordServiceImpl.java

@@ -6,8 +6,11 @@ import com.wwdz.ch.admin.entity.request.DataPanelRequestDto;
 import com.wwdz.ch.admin.entity.vo.DataPanelVo;
 import com.wwdz.ch.admin.service.AdminDashbordService;
 import com.wwdz.ch.core.api.WxAppletApi;
+import com.wwdz.ch.core.consts.DashbordEnum;
 import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.PriceUtil;
+import com.wwdz.ch.core.util.TimeUtil;
 import com.wwdz.ch.db.bean.OrderDataStat;
 import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
@@ -20,6 +23,7 @@ import com.wwdz.ch.db.dto.request.distribution.DistributorProfitRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
 import com.xxdxxs.utils.DateUtils;
 import io.swagger.models.auth.In;
+import javafx.util.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,12 +76,21 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
     @Override
     public Result dataPanel(DataPanelRequestDto dto) {
         try {
-            LocalDate localDate = LocalDate.parse(dto.getStartTime());
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-            String formattedDate = localDate.format(formatter);
+            Pair<String, String> pair = TimeUtil.getAccessDate(dto.getType());
+            String startTimeStr = pair.getKey();
+            String endTimeStr = pair.getValue();
+            logger.info("数据面板查询的时间范围 : {} - {}", startTimeStr, endTimeStr);
             DataPanelVo dataPanelVo = new DataPanelVo();
             //查询小程序访问数据
-            Result result = wxAppletApi.getAccessData(formattedDate, formattedDate, null);
+            String key;
+            if (dto.getType() == DashbordEnum.TypeEnum.YESTERDAY.getCode()) {
+                key = "day";
+            } else if (dto.getType() == DashbordEnum.TypeEnum.CURRENT_WEEK.getCode() || dto.getType() == DashbordEnum.TypeEnum.LAST_WEEK.getCode()) {
+                key = "week";
+            } else {
+                key = "month";
+            }
+            Result result = wxAppletApi.getAccessData(pair.getKey(), pair.getKey(), key);
             if (result.getSuccess()) {
                 Map<String, Integer> map = (Map<String, Integer>) result.getData();
                 dataPanelVo.setVisitNum(map.get("visitUv"));
@@ -86,8 +99,9 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             }
             //查询新增藏品数量
             SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
-            Date startTime = DateUtils.parseString(dto.getStartTime());
-            Date endTime = DateUtil.endOfDay(startTime);
+            SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+            Date startTime = DateUtil.beginOfDay(format.parse(startTimeStr));
+            Date endTime =  DateUtil.endOfDay(format.parse(endTimeStr));
             supplierItemRequestDto.setStartCreateTime(startTime);
             supplierItemRequestDto.setEndCreateTime(endTime);
             long count = supplierItemDao.countNewItem(supplierItemRequestDto);
@@ -98,6 +112,12 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             collectOrderDto.setStartCreateTime(startTime);
             collectOrderDto.setEndCreateTime(endTime);
             OrderDataStat collectOrderDataStat = distributorProfitDao.countOrderData(collectOrderDto);
+            Map<String, Object> collectOrderData = new HashMap<>();
+            collectOrderData.put("totalAmount", PriceUtil.convertPriceFenToYuan(collectOrderDataStat.getTotalAmount()));
+            collectOrderData.put("totalOrderNum", collectOrderDataStat.getTotalOrderNum());
+            double channelTotalProfit = collectOrderDataStat.getTotalAmount().doubleValue() * 0.05;
+            collectOrderData.put("totalProfit", PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(channelTotalProfit)));
+            dataPanelVo.setCollectOrderData(collectOrderData);
 
             //统计分销订单数据
             DistributorProfitRequestDto distirbutionOrderDto = new DistributorProfitRequestDto();
@@ -105,6 +125,15 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             distirbutionOrderDto.setStartCreateTime(startTime);
             distirbutionOrderDto.setEndCreateTime(endTime);
             OrderDataStat distirbutionOrderDataStat = distributorProfitDao.countOrderData(distirbutionOrderDto);
+
+            Map<String, Object> distributionOrderData = new HashMap<>();
+            collectOrderData.put("totalAmount", PriceUtil.convertPriceFenToYuan(distirbutionOrderDataStat.getTotalAmount()));
+            collectOrderData.put("totalOrderNum", distirbutionOrderDataStat.getTotalOrderNum());
+            double distributorProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() * 0.03;
+            double channelDistributionProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() - distributorProfit;
+            collectOrderData.put("totalProfit", PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(channelDistributionProfit)));
+            dataPanelVo.setDistributionOrderData(distributionOrderData);
+            return Result.success(dataPanelVo);
         } catch (Exception e) {
             logger.error("查询数据看板 error:{}", e);
         }
@@ -112,12 +141,12 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
     }
 
     public static void main(String[] args) throws ParseException {
-        Date date = DateUtils.parseString("2024-05-07");
-        System.out.println(date);
-        System.out.println(DateUtil.endOfDay(date));
-        LocalDate localDate = LocalDate.parse("2024-05-07");
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        String formattedDate = localDate.format(formatter);
-        System.out.println(formattedDate);
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+        String startTimeStr = "20240507";
+        String endTimeStr = "20240507";
+        Date startTime = DateUtil.beginOfDay(format.parse(startTimeStr));
+        Date endTime =  DateUtil.endOfDay(format.parse(endTimeStr));
+        System.out.println(startTime);
+        System.out.println(endTime);
     }
 }