From fbab10ba0e4a34279b5c3c3464679951c67ef0d1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 2 Jan 2025 12:11:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/wallet/api/dto/MchManageDto.java    | 11 +++++++++++
 .../wallet/api/feign/RemoteMchService.java      |  4 ++++
 .../wallet/controller/MchManageController.java  | 17 +++++++++++++----
 pom.xml                                         |  1 -
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java
index 499b09ae9..e8f477052 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java
@@ -1,8 +1,19 @@
 package com.bsd.pjcloud.wallet.api.dto;
 
 import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import java.util.List;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 public class MchManageDto extends MchManageEntity {
+
+    private List<Long> deptIds;
+
 }
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java
index 48312cb12..0d3e8fdf0 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java
@@ -18,6 +18,10 @@ public interface RemoteMchService {
     @GetMapping("/get-by-id")
     R<MchManageDto> getById(@RequestParam Long id);
 
+    @NoToken
+    @GetMapping("/get-by-ids")
+    R<List<MchManageDto>> getByIds(@RequestParam List<Long> ids);
+
     @NoToken
     @GetMapping("/get-by-dept-id")
     R<MchManageDto> getByDeptId(@RequestParam Long deptId);
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java
index b0e0d952b..b5dec56c7 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java
@@ -14,6 +14,7 @@ import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
 import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
+import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import com.bsd.pjcloud.wallet.service.MchManageService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -35,8 +36,8 @@ import java.util.List;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/mchManage")
-@Tag(description = "mchManage", name = "商户管理管理")
+@RequestMapping("/mch-manage")
+@Tag(description = "mch-manage", name = "商户管理管理")
 @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class MchManageController {
 
@@ -52,6 +53,14 @@ public class MchManageController {
         return R.ok(BeanUtils.toBean(mchManage, MchManageDto.class));
     }
 
+    @Inner
+    @GetMapping("/get-by-ids")
+    public R<List<MchManageDto>> getByIds(@RequestParam List<Long> ids) {
+        Page<MchManageVo> page = mchManageService.pageJoin(new Page<>(), MchManageDto.builder().deptIds(ids).build());
+        if (ObjectUtil.isAllNotEmpty(page, page.getRecords())) return R.failed("商户不存在");
+        return R.ok(BeanUtils.toBean(page.getRecords(), MchManageDto.class));
+    }
+
     @Inner
     @GetMapping("/get-by-dept-id")
     public R<MchManageDto> getByDeptId(@RequestParam Long deptId) {
@@ -93,9 +102,9 @@ public class MchManageController {
      * @return
      */
     @Operation(summary = "分页复杂查询", description = "分页查询")
-    @GetMapping("/page")
+    @GetMapping("/page-join")
     @PreAuthorize("@pms.hasPermission('wallet_mchManage_view')")
-    public R getMchManagePage(@ParameterObject Page page, @ParameterObject MchManageDto dto) {
+    public R getMchManagePageJoin(@ParameterObject Page page, @ParameterObject MchManageDto dto) {
         return R.ok(mchManageService.pageJoin(page, dto));
     }
 
diff --git a/pom.xml b/pom.xml
index 25845d9f2..bcb840dd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,6 @@
         <module>pjcloud-wallet</module>
         <module>pjcloud-supermarket</module>
         <module>pjcloud-hardware</module>
-        <module>pjcloud-merchant</module>
     </modules>
 
     <dependencyManagement>