From ddca8e96ee1aa47ba33fcf3a9a1e7e964d63ad8b Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 31 十月 2024 17:15:43 +0800
Subject: [PATCH] fix: 钱包供应商财务1
---
src/main/java/com/mzl/flower/service/statistics/StatisticsService.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java b/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
index a2c7a37..9b2aecc 100644
--- a/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
+++ b/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
@@ -1,8 +1,10 @@
package com.mzl.flower.service.statistics;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.config.exception.ValidationException;
+import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.flower.FlowerQueryDTO;
import com.mzl.flower.dto.request.payment.OrderItemSalesQueryDTO;
@@ -12,19 +14,24 @@
import com.mzl.flower.dto.response.statistics.RateStatisticsDTO;
import com.mzl.flower.dto.response.statistics.SaleStatisticsDTO;
import com.mzl.flower.entity.customer.Customer;
+import com.mzl.flower.entity.ip.UserAccess;
import com.mzl.flower.entity.payment.Order;
import com.mzl.flower.entity.supplier.Supplier;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.flower.FlowerMapper;
+import com.mzl.flower.mapper.ip.UserAccessMapper;
import com.mzl.flower.mapper.payment.*;
import com.mzl.flower.mapper.supplier.SupplierMapper;
import com.mzl.flower.service.BaseService;
+import com.mzl.flower.utils.IpUtil;
import io.micrometer.core.instrument.util.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
@@ -54,6 +61,9 @@
@Autowired
private CustomerMapper customerMapper;
+
+ @Autowired
+ private UserAccessMapper userAccessMapper;
public SaleStatisticsDTO getSaleStatistics(String date){
if(StringUtils.isEmpty(date)){
@@ -95,7 +105,12 @@
.eq("is_enabled", 1)
.eq("status", "P")
.eq("deleted", 0));
- dto.setSupplierCount(sc.longValue());//用户管理：统计商户列表已启用的全部用户（点击跳转到商户列表）
+ dto.setSupplierCount(sc.longValue());
+
+ Integer cc = customerMapper.selectCount(new QueryWrapper<Customer>()
+ .eq("is_enabled", 1)
+ .eq("deleted", 0));
+ dto.setCustomerCount(cc.longValue());//用户管理：统计商户列表已启用的全部用户（点击跳转到商户列表）
Integer oc = orderMapper.selectCount(new QueryWrapper<Order>()
.eq("deleted", 0)
@@ -297,8 +312,22 @@
LocalDateTime beginY = begin.plusDays(-1);
RateStatisticsDTO dto = new RateStatisticsDTO();
- //TODO 用户访问量：点击到交易大厅或者商品详情页面计算，同一个用户，每天只计算一次（包含游客）（并计算新增量，计算日环比）
+ //用户访问量：点击到交易大厅或者商品详情页面计算，同一个用户，每天只计算一次（包含游客）（并计算新增量，计算日环比）
+ Integer c = userAccessMapper.selectCount(new QueryWrapper<UserAccess>());
+ dto.setCount(c.longValue());
+
+ Integer cT = userAccessMapper.selectCount(new QueryWrapper<UserAccess>()
+ .gt("create_time", begin)
+ .le("create_time", end)
+ );
+ dto.setCountToday(cT.longValue());
+
+ Integer cY = userAccessMapper.selectCount(new QueryWrapper<UserAccess>()
+ .gt("create_time", beginY)
+ .le("create_time", endY)
+ );
+ dto.setCountRate(getRate(cT, cY));
return dto;
}
@@ -356,8 +385,36 @@
BigDecimal yy = BigDecimal.valueOf(yesterday);
BigDecimal rate = ttyy.divide(yy, 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
return rate.doubleValue();
+ } else if (today <= 0) {
+ return 0D;
}
return 100D;
}
+
+
+ public void addUserAccessRecord(HttpServletRequest request){
+ String userId = SecurityUtils.getUserId();
+ String ip = null;
+ try {
+ ip = IpUtil.getIpAddress(request);
+ } catch (IOException e) {
+ ip = "127.0.0.1";
+ }
+ String ipId = ip+":"+(StringUtils.isBlank(userId)?"0":userId);
+
+ LocalDate localDate = LocalDate.now();
+ LocalDateTime end = localDate.atTime(23, 59, 59);
+ LocalDateTime begin = localDate.atTime(0, 0, 0);
+ int count = userAccessMapper.selectCount(new LambdaQueryWrapper<UserAccess>()
+ .eq(UserAccess::getIpId, ipId)
+ .gt(UserAccess::getCreateTime, begin)
+ .le(UserAccess::getCreateTime, end));
+ if(count==0){
+ UserAccess record = new UserAccess();
+ record.setIpId(ipId);
+ record.setCreateTime(LocalDateTime.now());
+ userAccessMapper.insert(record);
+ }
+ }
}
--
Gitblit v1.9.3