From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 19:11:37 +0800
Subject: [PATCH] 2024.04新增内容
---
meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java b/meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java
index c384ea3..58c8b7a 100644
--- a/meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java
+++ b/meiya-admin/src/main/java/com/sinata/modular/mall/controller/CommissionSettlementController.java
@@ -5,12 +5,15 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.sinata.common.enums.EnumCityRole;
import com.sinata.core.base.controller.BaseController;
import com.sinata.core.base.tips.ErrorTip;
import com.sinata.core.base.tips.SuccessTip;
import com.sinata.core.common.annotion.BussinessLog;
import com.sinata.core.common.annotion.Permission;
import com.sinata.core.common.constant.factory.PageFactory;
+import com.sinata.core.shiro.ShiroKit;
+import com.sinata.core.shiro.ShiroUser;
import com.sinata.core.util.DateUtils2;
import com.sinata.core.util.ExcelExportUtil;
import com.sinata.core.util.ExcelImportUtil;
@@ -18,6 +21,9 @@
import com.sinata.modular.mall.service.ICommissionSettlementMonthService;
import com.sinata.modular.member.model.MemUser;
import com.sinata.modular.member.service.IMemUserService;
+import com.sinata.modular.system.model.Role;
+import com.sinata.modular.system.service.IRoleService;
+import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,6 +56,8 @@
@Autowired
private ICommissionSettlementMonthService commissionSettlementMonthService;
+ @Autowired
+ private IRoleService roleService;
/**
* 跳转到佣金结算明细首页
@@ -77,9 +85,31 @@
if (StrUtil.isNotBlank(endTime)) {
endTime = endTime.replace("-", "");
}
+
+ String cityCode = "";
+ try {
+ // 【城市管理员】数据查询
+ ShiroUser shiroUser = ShiroKit.getUser();
+ List<Integer> roleList = shiroUser.getRoleList();
+ List<Integer> cityRoleList = roleService.selectList(
+ new EntityWrapper<Role>().in("id", roleList)).stream().map(Role::getCityRole)
+ .collect(
+ Collectors.toList());
+ if (cityRoleList.contains(EnumCityRole.CITY_ROLE.index)) {
+ // 市级城市管理员
+ cityCode = shiroUser.getCityCode().substring(0, 4);
+ }
+ else if (cityRoleList.contains(EnumCityRole.PROVINCE_ROLE.index)) {
+ // 省级城市管理员
+ cityCode = shiroUser.getCityCode().substring(0, 2);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
// 查询数据列表
- page.setTotal(commissionSettlementMonthService.queryListCount(beginTime, endTime, condition, condition1, condition2, condition3, null));
- List<CommissionSettlementMonth> list = commissionSettlementMonthService.queryList(beginTime, endTime, condition, condition1, condition2, condition3, null, page.getCurrent(), page.getSize());
+ page.setTotal(commissionSettlementMonthService.queryListCount(beginTime, endTime, condition, condition1, condition2, cityCode, condition3, null));
+ List<CommissionSettlementMonth> list = commissionSettlementMonthService.queryList(beginTime, endTime, condition, condition1, condition2, cityCode, condition3, null, page.getCurrent(), page.getSize());
page.setRecords(list);
return super.packForBT(page);
}
@@ -87,7 +117,7 @@
@Permission
@ResponseBody
@RequestMapping(value = "/export")
- public void exportOrder(String beginTime, String endTime, String condition, String condition1, String condition2, Integer condition3, HttpServletResponse response) throws IOException {
+ public void exportOrder(String beginTime, String endTime, String condition, String condition1, String condition2, String cityCode, Integer condition3, HttpServletResponse response) throws IOException {
// 时间搜索
if (StrUtil.isNotBlank(beginTime)) {
beginTime = beginTime.replace("-", "");
@@ -96,7 +126,7 @@
endTime = endTime.replace("-", "");
}
// 查询数据列表
- List<CommissionSettlementMonth> list = commissionSettlementMonthService.queryList(beginTime, endTime, condition, condition1, condition2, condition3, null, null, null);
+ List<CommissionSettlementMonth> list = commissionSettlementMonthService.queryList(beginTime, endTime, condition, condition1, condition2, cityCode, condition3, null, null, null);
List<List<Object>> dataList = new ArrayList<>();
List<Object> titles = CollUtil.newArrayList(
--
Gitblit v1.7.1