update 财务中心查询接口新增字段、增加搜索

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<String> deptIds;
+
+}

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<String> getDeptIdsByAppId(@Param("appId") String appId);
+
+	/**
+	 * 后管财务中心页面运营商列表
+	 * @param dto
+	 * @return
+	 */
+	List<MerchantSettleInfoVO> queryMerchantSettleInfoList(@Param("dto") QueryMerchantInfoDTO dto);
 }

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<PileMerchantInfo> queryInfoListByIds(AuthorizedDeptVO authorizedMap);
+	List<MerchantSettleInfoVO> queryMerchantInfoListByAuth(QueryMerchantInfoDTO dto);
 
 	/**
 	 * 查询一级运营商列表

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<PileMerchantInfo> queryInfoListByIds(AuthorizedDeptVO authorizedMap) {
+	public List<MerchantSettleInfoVO> 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<String> 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);
 	}
 
 

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;
+}