From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
index ae176d4..9c49cd6 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
@@ -7,6 +7,7 @@
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
import com.stylefeng.guns.modular.system.enums.PayStatusEnum;
+import com.stylefeng.guns.modular.system.enums.StatusEnum;
import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITAgentService;
@@ -20,6 +21,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -72,6 +74,7 @@
if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
wrapper.eq("id",ShiroKit.getUser().getObjectId());
}
+ wrapper.ne("status", StatusEnum.DELETE.getCode());
return wrapper;
}
@@ -87,6 +90,7 @@
model.addAttribute("principal",tAgent.getPrincipal());
model.addAttribute("principalPhone",tAgent.getPrincipalPhone());
model.addAttribute("email",tAgent.getEmail());
+ model.addAttribute("serviceCalls",tAgent.getServiceCalls());
model.addAttribute("area",tAgent.getProvinceName()+tAgent.getCityName());
// 订单信息
// 订单总量
@@ -187,4 +191,19 @@
}
return tAgentRespList;
}
+
+ @Override
+ public void getDataStatistics(Integer agentId, Model model) {
+ // 代理商总数
+ Integer agentTotal = tAgentMapper.selectCount(new EntityWrapper<TAgent>()
+ .eq("id", agentId));
+ // 代理商最近一个月新增数量
+ LocalDate now = LocalDate.now();
+ LocalDate localDate = now.plusMonths(1);
+ Integer agentMonthTotal = tAgentMapper.selectCount(new EntityWrapper<TAgent>()
+ .eq("id", agentId)
+ .between("createTime", localDate, now));
+ model.addAttribute("agentTotal",agentTotal);
+ model.addAttribute("agentMonthTotal",agentMonthTotal);
+ }
}
--
Gitblit v1.7.1