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 6592b8453..f6cf3dd41 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 @@ -3,16 +3,14 @@ package com.jsowell.web.controller.pile; 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.PageUtils; -import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; -import com.jsowell.pile.dto.PageDTO; +import com.jsowell.pile.dto.QueryMerchantInfoDTO; import com.jsowell.pile.service.IPileMerchantInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -131,16 +129,10 @@ public class PileMerchantInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('pile:merchant:query')") @PostMapping("/getFinancialMerchantList") - public TableDataInfo getFinancialMerchantList(@RequestBody PageDTO dto) { + public TableDataInfo getFinancialMerchantList(@RequestBody QueryMerchantInfoDTO dto) { int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum(); int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize(); - // 权限过滤 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); - if (authorizedMap == null) { - // 为空表示没有权限,返回空数组 - return new TableDataInfo(); - } PageUtils.startPage(pageNum, pageSize); - return getDataTable(pileMerchantInfoService.queryInfoListByIds(authorizedMap)); + return getDataTable(pileMerchantInfoService.queryMerchantInfoListByAuth(dto)); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java new file mode 100644 index 000000000..b859273f2 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java @@ -0,0 +1,26 @@ +package com.jsowell.pile.dto; + +import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; +import lombok.Data; + +import java.util.List; + +/** + * 查询运营商信息DTO + * + * @author Lemon + * @Date 2023/9/16 11:05 + */ +@Data +public class QueryMerchantInfoDTO { + private Integer pageSize; + + private Integer pageNum; + + private String merchantId; + + private String merchantName; + + private List deptIds; + +} 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 71e95344c..9f490201c 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 @@ -1,6 +1,8 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.PileMerchantInfo; +import com.jsowell.pile.dto.QueryMerchantInfoDTO; +import com.jsowell.pile.vo.web.MerchantSettleInfoVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -103,4 +105,11 @@ public interface PileMerchantInfoMapper { * @return */ List getDeptIdsByAppId(@Param("appId") String appId); + + /** + * 后管财务中心页面运营商列表 + * @param dto + * @return + */ + List queryMerchantSettleInfoList(@Param("dto") QueryMerchantInfoDTO dto); } 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 c9c532749..94089f10f 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 @@ -3,7 +3,9 @@ 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.dto.QueryMerchantInfoDTO; import com.jsowell.pile.vo.base.MerchantInfoVO; +import com.jsowell.pile.vo.web.MerchantSettleInfoVO; import java.util.List; @@ -88,10 +90,10 @@ public interface IPileMerchantInfoService { /** * 通过ids查询信息列表 - * @param authorizedMap + * @param dto * @return */ - List queryInfoListByIds(AuthorizedDeptVO authorizedMap); + List queryMerchantInfoListByAuth(QueryMerchantInfoDTO dto); /** * 查询一级运营商列表 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 404bc0f08..d7675b368 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 @@ -5,6 +5,7 @@ import com.jsowell.common.constant.Constants; 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.core.page.TableDataInfo; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; @@ -13,9 +14,11 @@ import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; +import com.jsowell.pile.dto.QueryMerchantInfoDTO; import com.jsowell.pile.mapper.PileMerchantInfoMapper; import com.jsowell.pile.service.IPileMerchantInfoService; import com.jsowell.pile.vo.base.MerchantInfoVO; +import com.jsowell.pile.vo.web.MerchantSettleInfoVO; import com.jsowell.system.service.SysDeptService; import com.jsowell.system.service.SysUserService; import lombok.extern.slf4j.Slf4j; @@ -25,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.CompletableFuture; @@ -319,19 +323,28 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { /** * 通过ids查询信息列表 - * @param authorizedMap + * @param dto * @return */ @Override - public List queryInfoListByIds(AuthorizedDeptVO authorizedMap) { + public List queryMerchantInfoListByAuth(QueryMerchantInfoDTO dto) { + if (CollectionUtils.isEmpty(dto.getDeptIds())) { + dto.setDeptIds(Lists.newArrayList()); + } + // 权限过滤 + AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + if (authorizedMap == null) { + // 为空表示没有权限,返回空数组 + return new ArrayList<>(); + } String parentId = authorizedMap.getParentId(); - List deptIds = Lists.newArrayList(); // 父级id为0代表 thinkgem/jskf 账号 if (!StringUtils.equals("0", parentId)) { String deptId = authorizedMap.getDeptId(); - deptIds.add(deptId); + dto.getDeptIds().add(deptId); } - return pileMerchantInfoMapper.queryInfoListByIds(deptIds); + // return pileMerchantInfoMapper.queryInfoListByIds(deptIds); + return pileMerchantInfoMapper.queryMerchantSettleInfoList(dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantSettleInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantSettleInfoVO.java new file mode 100644 index 000000000..f727ceda2 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantSettleInfoVO.java @@ -0,0 +1,24 @@ +package com.jsowell.pile.vo.web; + +import lombok.Data; + +/** + * 后管财务中心页面VO + * + * @author Lemon + * @Date 2023/9/15 16:35 + */ +@Data +public class MerchantSettleInfoVO { + private String merchantId; + private String merchantName; + private String address; + private String status; + private String adapayMemberId; + private String settleAccountId; + private String auditStatus; + private String organizationCode; + private String managerName; + private String managerPhone; + private String createTime; +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index 341231a9e..871db2d15 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -368,4 +368,37 @@ and app_id = #{appId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue index 5184f9193..cdaa7807d 100644 --- a/jsowell-ui/src/views/financial/merchant.vue +++ b/jsowell-ui/src/views/financial/merchant.vue @@ -1,6 +1,6 @@