From 3e64a254550804933633fd88182f20d43dd2e718 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 25 Sep 2025 21:51:55 +0800
Subject: [PATCH] 订单-汇旺财多账户支付配置

---
 oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java b/oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java
index 0d41388..187dc4e 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java
@@ -5,6 +5,7 @@
 import com.oying.modules.system.service.MerchantService;
 import com.oying.modules.system.domain.dto.MerchantsQueryCriteria;
 import com.oying.utils.R;
+import com.oying.utils.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 
 import java.util.List;
@@ -48,6 +49,13 @@
         return new ResponseEntity<>(R.success(merchantService.queryAll(criteria, page)), HttpStatus.OK);
     }
 
+    @GetMapping("findByUserId")
+    @ApiOperation("根据用户查询商户信息")
+    @PreAuthorize("@el.check('merchant:list')")
+    public ResponseEntity<Object> findByUserId() {
+        return new ResponseEntity<>(R.success(merchantService.findByUserId(SecurityUtils.getCurrentUserId())), HttpStatus.OK);
+    }
+
     @PostMapping
     @Log("新增商户信息")
     @ApiOperation("新增商户信息")

--
Gitblit v1.9.3