From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java
index 2a965f3..b5bc5f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java
@@ -79,6 +79,13 @@
     R<ConvenientMerchantVO> getUserMerchantInfoByAccount(String account);
 
     /**
+     * 获取用户便民服务商家详情
+     * @param account 商家绑定账号
+     * @return
+     */
+    R<ConvenientMerchantVO> getMerchantInfoByAccount(String account);
+
+    /**
      * 获取商便民服务商家信息
      * @param userId
      * @return
@@ -139,4 +146,18 @@
      * @return
      */
     R timedTaskWriteDataToMerchantJobHandler();
+
+    /**
+     * check商家/店铺是否有效
+     * @param userId
+     * @return
+     */
+    Boolean checkStoreIsValid(Long userId);
+
+    /**
+     * 根据后台用户id查询
+     * @param userId
+     * @return
+     */
+    R getMerchantByUserId(Long userId);
 }

--
Gitblit v1.7.1