From 0b413f3fd67110cfd7752f27eb171bde06edc4b4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 18 八月 2023 18:56:39 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 280 insertions(+), 12 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 677b884..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
@@ -1,14 +1,19 @@
package com.ruoyi.shop.service.shop;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.shop.domain.pojo.shop.Shop;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
-import com.ruoyi.shop.domain.vo.AppShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopPageVo;
+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;
+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;
@@ -31,9 +36,9 @@
/**
* 创建商户
- * @param MGTEditShopDto
+ * @param mgtEditShopDto
*/
- void createShop(MgtEditShopDto MGTEditShopDto);
+ void createShop(MgtEditShopDto mgtEditShopDto);
/**
* 修改合作时间
@@ -42,12 +47,30 @@
void changeCooperationTime(MgtChangeCoopDto mgtChangeCoopDto);
/**
+ * @description 终止合作
+ * @author jqs
+ * @date 2023/6/20 12:01
+ * @param mgtTerminateCooperationDto
+ * @return void
+ */
+ void terminateMgtCooperation(MgtTerminateCooperationDto mgtTerminateCooperationDto);
+
+ /**
+ * @description 冻结商户
+ * @author jqs
+ * @date 2023/7/15 13:56
+ * @param mgtFrozenShopDto
+ * @return void
+ */
+ void frozenMgtShop(MgtFrozenShopDto mgtFrozenShopDto);
+
+ /**
* 分页获取商户
* @param page
* @param mgtShopPageDto
* @return
*/
- List<MgtShopPageVo> pageShop(Page page, MgtShopPageDto mgtShopPageDto);
+ List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto);
/**
* 获取商户详情
@@ -63,6 +86,15 @@
void editShopTag(MgtEditShopTagDto mgtEditShopTagDto);
/**
+ * @description 转移客户
+ * @author jqs
+ * @date 2023/6/28 16:36
+ * @param mgtTransferShopDto
+ * @return void
+ */
+ void transferMgtShop(MgtTransferShopDto mgtTransferShopDto);
+
+ /**
* 获取附近门店
* @param appNearbyShopDto
* @return
@@ -70,9 +102,245 @@
AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto, Member member);
/**
- * 获取商户详情
- * @param userId
+ *
+ * @param shopId
* @return
*/
- //MgtShopInfoVo getMerShopInfo(Long userId);
+ Shop getByShopId(Long shopId);
+
+
+ StaffHomeShopTotalVo getStaffHomeTotal(Long userId);
+
+ /**
+ * 获取商户端首页统计
+ * @param merBaseDto
+ * @return
+ */
+ MerHomeShopTotalVo getMerHomeTotal(MerBaseDto merBaseDto);
+
+ /**
+ * 商户获取代理商列表
+ * @param page
+ * @param merAgencyPageDto
+ * @return
+ */
+ List<MerAgencyPageVo> pageMerAgencyVo (Page page, MerAgencyPageDto merAgencyPageDto);
+
+ /**
+ * @description 平台获取商户分成列表
+ * @author jqs
+ * @date 2023/6/8 9:25
+ * @param page
+ * @param mgtShopProportionPageDto
+ * @return List<MgtShopProportionPageVo>
+ */
+ List<MgtShopProportionPageVo> pageMgtShopProportion(Page page, MgtShopProportionPageDto mgtShopProportionPageDto);
+
+ /**
+ * @description 删除商户标签
+ * @author jqs
+ * @date 2023/6/8 15:53
+ * @param shopTag
+ * @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) throws WxPayException;
+
+ /**
+ * @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);
+
+ /**
+ * @description 获取商户下属代理商
+ * @author jqs
+ * @date 2023/7/3 17:27
+ * @param shopId
+ * @return List<Long>
+ */
+ List<Long> listShopIdByShopId(Long shopId);
+
+ /**
+ * @description 获取商户下属代理商
+ * @author jqs
+ * @date 2023/7/3 18:18
+ * @param shopId
+ * @return List<MgtSimpleShopVo>
+ */
+ List<MgtSimpleShopVo> listShopByShop(Long shopId);
+
+ /**
+ * @description 获取用户管理商户
+ * @author jqs
+ * @date 2023/7/14 10:00
+ * @param userId
+ * @return Shop
+ */
+ Shop getShopByBelongUserId(Long userId);
+
+ /**
+ * @description 员工端获取商户列表
+ * @author jqs
+ * @date 2023/7/14 15:26
+ * @param page
+ * @param staffShopPageDto
+ * @return List<StaffShopPageVo>
+ */
+ List<StaffShopPageVo> pageStaffShop(Page page, StaffShopPageDto staffShopPageDto);
+
+ /**
+ * @description 获取员工端商户数量统计
+ * @author jqs
+ * @date 2023/7/14 15:51
+ * @param userId
+ * @return StaffShopSimpleTotalVo
+ */
+ StaffShopSimpleTotalVo getStaffSimpleTotal(Long userId);
+
+ /**
+ * @description 员工端获取商户详情
+ * @author jqs
+ * @date 2023/7/14 18:32
+ * @param shopId
+ * @return StaffShopInfoGetVo
+ */
+ StaffShopInfoGetVo getStaffShopInfo(Long shopId);
+
+ /**
+ * @description 修改商户评估
+ * @author jqs
+ * @date 2023/7/15 10:18
+ * @param staffShopEstimateEditDto
+ * @return void
+ */
+ void editShopEstimate(StaffShopEstimateEditDto staffShopEstimateEditDto);
+
+ /**
+ * @description 修改店铺扩展联系人
+ * @author jqs
+ * @date 2023/7/15 11:06
+ * @param staffShopECEditDto
+ * @return void
+ */
+ void editExtendContacts(StaffShopECEditDto staffShopECEditDto);
+
+ /**
+ * @description 修改店铺状态
+ * @author jqs
+ * @date 2023/7/15 11:51
+ * @param staffShopCCEditDto
+ * @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