From 3c9e545c80af5515264f28dd60c46b1147281581 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Wed, 17 Sep 2025 20:17:33 +0800
Subject: [PATCH] docs(ProductInventoryService):给类中方法添加注释

---
 oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
index fc2cc34..24bcd05 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
@@ -15,19 +15,18 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.oying.utils.PageUtil;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
+
 import com.oying.utils.PageResult;
 
 /**
-* @description 服务实现
-* @author lixin
-* @date 2025-05-29
-**/
+ * @author lixin
+ * @description 服务实现
+ * @date 2025-05-29
+ **/
 @Service
 @RequiredArgsConstructor
 public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> implements MerchantService {
@@ -36,13 +35,18 @@
     private final UserMerchantService userMerchantService;
 
     @Override
-    public PageResult<Merchant> queryAll(MerchantsQueryCriteria criteria, Page<Object> page){
+    public PageResult<Merchant> queryAll(MerchantsQueryCriteria criteria, Page<Object> page) {
         return PageUtil.toPage(merchantMapper.findAll(criteria, page));
     }
 
     @Override
-    public List<Merchant> queryAll(MerchantsQueryCriteria criteria){
+    public List<Merchant> queryAll(MerchantsQueryCriteria criteria) {
         return merchantMapper.findAll(criteria);
+    }
+
+    @Override
+    public List<Merchant> findByUserId(Long userId) {
+        return merchantMapper.findByUserId(userId);
     }
 
     @Override
@@ -76,6 +80,7 @@
         List<Map<String, Object>> list = new ArrayList<>();
         for (Merchant merchant : all) {
             Map<String, Object> map = new LinkedHashMap<>();
+            map.put("商户类型", merchant.getMerchantType());
             map.put("名称", merchant.getMerchantName());
             map.put("商户编码", merchant.getMerchantCode());
             map.put("营业执照号", merchant.getBusinessLicense());

--
Gitblit v1.9.3