From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 21 八月 2023 19:03:55 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
index b334032..938e098 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.ruoyi.shop.domain.dto.*;
 import com.ruoyi.shop.domain.vo.*;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
 import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
 import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
 import com.ruoyi.system.api.domain.poji.member.Member;
@@ -111,10 +113,10 @@
 
     /**
      * 获取商户端首页统计
-     * @param userId
+     * @param merBaseDto
      * @return
      */
-    MerHomeShopTotalVo getMerHomeTotal(Long userId);
+    MerHomeShopTotalVo getMerHomeTotal(MerBaseDto merBaseDto);
 
     /**
      * 商户获取代理商列表
@@ -206,7 +208,7 @@
      * @param mgtShopAuthDto
      * @return  void
      */
-    void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto);
+    void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) throws WxPayException;
 
     /**
      * @description  获取平台商户统计
@@ -325,4 +327,20 @@
      * @return  void
      */
     void editShopCustomStatus(StaffShopCCEditDto staffShopCCEditDto);
+
+    /**
+     * 微信二级商户进件状态 定时任务检测
+     */
+    void queryEcommerceApplyMentsStatus();
+    
+    /**
+     * @description  
+     * @author  jqs
+     * @date    2023/8/10 22:54
+     * @param cityCodes
+     * @return  List<Long>
+     */
+    List<Long> listShopIdByCityCode(List<String> cityCodes);
+
+    void authShop();
 }

--
Gitblit v1.7.1