From 4d68c43eb83a8a3ff0b04745a4b6cfc38f6db790 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 6 Jul 2023 15:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/OrderBasicInfoController.java | 2 + .../pile/PileMerchantInfoController.java | 21 ++ .../core/domain/vo/AuthorizedDeptVO.java | 3 + .../jsowell/common/util/SecurityUtils.java | 1 + .../pile/mapper/PileMerchantInfoMapper.java | 7 + .../service/IPileMerchantInfoService.java | 8 + .../impl/PileMerchantInfoServiceImpl.java | 23 +- .../mapper/pile/PileMerchantInfoMapper.xml | 14 ++ .../service/impl/LianLianServiceImpl.java | 2 +- jsowell-ui/src/api/pile/merchant.js | 8 + jsowell-ui/src/views/financial/merchant.vue | 225 +++++++++++------- 11 files changed, 227 insertions(+), 87 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 78b0822fc..9babbed91 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -144,4 +144,6 @@ public class OrderBasicInfoController extends BaseController { public AjaxResult manualSettlementOrder(@RequestBody ManualSettlementDTO dto) { return toAjax(orderService.manualSettlementOrder(dto)); } + + } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java index 2e0b8f889..705c1fa6b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java @@ -1,11 +1,15 @@ package com.jsowell.web.controller.pile; +import com.google.common.collect.Lists; import com.jsowell.common.annotation.Log; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; +import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.util.SecurityUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; @@ -15,6 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -109,4 +114,20 @@ public class PileMerchantInfoController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(pileMerchantInfoService.deletePileMerchantInfoByIds(ids)); } + + /** + * 财务管理页面获取运营商列表 + * @return + */ + @PreAuthorize("@ss.hasPermi('pile:merchant:query')") + @GetMapping("/getFinancialMerchantList") + public TableDataInfo getFinancialMerchantList() { + // 权限过滤 + AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + if (authorizedMap == null) { + // 为空表示没有权限，返回空数组 + return new TableDataInfo(); + } + return getDataTable(pileMerchantInfoService.queryInfoListByIds(authorizedMap)); + } } diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/vo/AuthorizedDeptVO.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/vo/AuthorizedDeptVO.java index f8803095c..1b7513d7a 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/vo/AuthorizedDeptVO.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/vo/AuthorizedDeptVO.java @@ -23,4 +23,7 @@ public class AuthorizedDeptVO { // 运营商id private List merchantIds; + + // 父级id + private String parentId; } diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java index a5514c056..7401cda80 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java @@ -132,6 +132,7 @@ public class SecurityUtils { // 登录用户角色 List roles = user.getRoles(); Long parentId = dept.getParentId(); + resultVO.setParentId(String.valueOf(parentId)); List merchantDeptIds = Lists.newArrayList(); List stationDeptIds = Lists.newArrayList(); if (parentId == 0L) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java index 59de9f945..736c6d36b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java @@ -77,4 +77,11 @@ public interface PileMerchantInfoMapper { * @return */ PileMerchantInfo queryInfoByDeptId(@Param("deptId") String deptId); + + /** + * 通过ids查询信息列表 + * @param ids + * @return + */ + List queryInfoListByIds(@Param("deptIds") List deptIds); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java index ea6c74b36..e28749b15 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java @@ -1,5 +1,6 @@ package com.jsowell.pile.service; +import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; import com.jsowell.pile.vo.base.MerchantInfoVO; @@ -73,4 +74,11 @@ public interface IPileMerchantInfoService { List queryByMerchantDeptIds(List merchantDeptIds); PileMerchantInfo queryInfoByDeptId(String deptId); + + /** + * 通过ids查询信息列表 + * @param authorizedMap + * @return + */ + List queryInfoListByIds(AuthorizedDeptVO authorizedMap); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index c7b07219f..0f06a6742 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -6,10 +6,7 @@ import com.jsowell.common.core.domain.entity.SysDept; import com.jsowell.common.core.domain.entity.SysUser; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.util.DateUtils; -import com.jsowell.common.util.DictUtils; -import com.jsowell.common.util.SecurityUtils; -import com.jsowell.common.util.StringUtils; +import com.jsowell.common.util.*; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; import com.jsowell.pile.mapper.PileMerchantInfoMapper; @@ -250,4 +247,22 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { public PileMerchantInfo queryInfoByDeptId(String deptId) { return pileMerchantInfoMapper.queryInfoByDeptId(deptId); } + + /** + * 通过ids查询信息列表 + * @param authorizedMap + * @return + */ + @Override + public List queryInfoListByIds(AuthorizedDeptVO authorizedMap) { + String parentId = authorizedMap.getParentId(); + List deptIds = Lists.newArrayList(); + // 父级id为100表示为 thinkgem 账号, 0为 jskf 账号 + if (!StringUtils.equals("100", parentId) && !StringUtils.equals("0", parentId)) { + String deptId = authorizedMap.getDeptId(); + deptIds.add(deptId); + } + PageUtils.startPage(); + return pileMerchantInfoMapper.queryInfoListByIds(deptIds); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index 5ca8b844a..0e3aec0ae 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -286,4 +286,18 @@ where dept_id = #{deptId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 7e0e8ee02..7310521a8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -1528,7 +1528,7 @@ public class LianLianServiceImpl implements LianLianService { List resultList = new ArrayList<>(); // 通过站点id查询桩基本信息 List list = pileBasicInfoService.getPileListByStationId(String.valueOf(pileStationInfo.getId())); - MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(String.valueOf(pileStationInfo.getMerchantId())); + // MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(String.valueOf(pileStationInfo.getMerchantId())); // 封装成联联平台对象 for (PileBasicInfo pileBasicInfo : list) { EquipmentInfo equipmentInfo = new EquipmentInfo(); diff --git a/jsowell-ui/src/api/pile/merchant.js b/jsowell-ui/src/api/pile/merchant.js index 90e08fa33..605759392 100644 --- a/jsowell-ui/src/api/pile/merchant.js +++ b/jsowell-ui/src/api/pile/merchant.js @@ -51,3 +51,11 @@ export function getMerchantList(query) { params: query }) } + +// 财务管理页面获取运营商列表 +export function getFinancialMerchantList() { + return request({ + url: '/pile/merchant/getFinancialMerchantList', + method: 'get' + }) +} diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue index def109084..634619530 100644 --- a/jsowell-ui/src/views/financial/merchant.vue +++ b/jsowell-ui/src/views/financial/merchant.vue @@ -26,32 +26,32 @@ />
- - - + + + - - - + + + - - - + + +
{{ showOrHideText }} + >{{ showOrHideText }} @@ -77,7 +77,8 @@ icon="el-icon-search" size="mini" @click="handleQuery" - >搜索搜索 + @@ -85,7 +86,8 @@ icon="el-icon-refresh" size="mini" @click="resetQuery" - >重置重置 + 导出导出 + - - - - - - - - - - - -