From a016ab9f97b76c3b4905b890662d344d47f24005 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 28 六月 2023 18:25:14 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 130 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 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 42750ec..4afb2d2 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
@@ -1,12 +1,17 @@
package com.ruoyi.shop.service.shop;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.*;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.baomidou.mybatisplus.extension.service.IService;
+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;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
+import com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import java.util.List;
@@ -40,12 +45,21 @@
void changeCooperationTime(MgtChangeCoopDto mgtChangeCoopDto);
/**
+ * @description 终止合作
+ * @author jqs
+ * @date 2023/6/20 12:01
+ * @param mgtTerminateCooperationDto
+ * @return void
+ */
+ void terminateMgtCooperation(MgtTerminateCooperationDto mgtTerminateCooperationDto);
+
+ /**
* 分页获取商户
* @param page
* @param mgtShopPageDto
* @return
*/
- List<MgtShopPageVo> pageShop(Page page, MgtShopPageDto mgtShopPageDto);
+ List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto);
/**
* 获取商户详情
@@ -59,6 +73,15 @@
* @param mgtEditShopTagDto
*/
void editShopTag(MgtEditShopTagDto mgtEditShopTagDto);
+
+ /**
+ * @description 转移客户
+ * @author jqs
+ * @date 2023/6/28 16:36
+ * @param mgtTransferShopDto
+ * @return void
+ */
+ void transferMgtShop(MgtTransferShopDto mgtTransferShopDto);
/**
* 获取附近门店
@@ -109,4 +132,105 @@
* @return void
*/
void deleteShopTag(String shopTag);
+
+ /**
+ * @description 通过code获取shopId
+ * @author jqs
+ * @date 2023/6/9 16:40
+ * @param mgtShopIdByCodeDto
+ * @return MgtShopIdByCodeVo
+ */
+ MgtShopIdByCodeVo getShopIdByCode(MgtShopIdByCodeDto mgtShopIdByCodeDto);
+
+ /**
+ * @description 获取商户list
+ * @author jqs
+ * @date 2023/6/12 14:37
+ * @param mgtShopListDto
+ * @return List<MgtShopListSimpleVo>
+ */
+ List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto);
+
+ /**
+ * @description 通过id获取商户列表
+ * @author jqs
+ * @date 2023/6/14 17:53
+ * @param shopIds
+ * @return List<MgtSimpleShopVo>
+ */
+ List<MgtSimpleShopVo> listShopSimpleVoByIds(String shopIds);
+
+ /**
+ * @description pageMgtShopByCityCode
+ * @param page
+ * @param mgtShopByCodePageDto
+ * @return List<MgtSimpleShopVo>
+ * @author jqs34
+ * @date 2023/6/14 20:56
+ */
+ List<MgtSimpleShopVo> pageMgtShopByCityCode(Page page, MgtShopByCodePageDto mgtShopByCodePageDto);
+
+ /**
+ * @description pageMgtShopAuth
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return List<MgtShopAuthPageVo>
+ * @author jqs34
+ * @date 2023/6/15 0:05
+ */
+ List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto);
+
+ /**
+ * @description boardShopTotal
+ * @param
+ * @return MgtBulletinBoardVo
+ * @author jqs34
+ * @date 2023/6/18 17:01
+ */
+ MgtBulletinBoardVo boardShopTotal();
+
+ /**
+ * @description 商户进件
+ * @author jqs
+ * @date 2023/6/19 11:02
+ * @param mgtShopAuthDto
+ * @return void
+ */
+ void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto);
+
+ /**
+ * @description 获取平台商户统计
+ * @author jqs
+ * @date 2023/6/21 16:25
+ * @param mgtBasePlatformDto
+ * @return MgtPlTotalShopTotalVo
+ */
+ MgtPlTotalShopTotalVo getPlTotalShopTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取平台统计shopId
+ * @param mgtBasePlatformDto
+ * @return List<Long>
+ * @author jqs34
+ * @date 2023/6/23 14:13
+ */
+ List<Long> listShopIdByPlTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 获取商户审核资料
+ * @author jqs
+ * @date 2023/6/25 10:37
+ * @param authId
+ * @return MgtShopAuthGetVo
+ */
+ MgtShopAuthGetVo getMgtShopAuth(String authId);
+
+ /**
+ * @description 获取商户验证信息
+ * @author jqs
+ * @date 2023/6/26 10:38
+ * @param authId
+ * @return MgtShopAuthCodeVo
+ */
+ MgtShopAuthCodeVo getMgtShopAuthCode(String authId);
}
--
Gitblit v1.7.1