From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 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 75f51f2..b0ae7fe 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,9 +1,11 @@
package com.ruoyi.shop.service.shop;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverRequest;
import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
@@ -68,7 +70,7 @@
* @param mgtShopPageDto
* @return
*/
- List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto);
+ List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto,List<Long> scope);
/**
* 获取商户详情
@@ -159,7 +161,7 @@
* @param mgtShopListDto
* @return List<MgtShopListSimpleVo>
*/
- List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto);
+ List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto,List<Long> scope);
/**
* @description 通过id获取商户列表
@@ -188,7 +190,18 @@
* @author jqs34
* @date 2023/6/15 0:05
*/
- List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto);
+ List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto,
+ List<Long> scope);
+
+
+ /**
+ * 商户进件列表数据（汇付天下）
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return
+ */
+ List<MgtShopHFTXAuthPageVo> pageMgtShopHFTXAuth(Page page, MgtShopHFTXAuthPageDto mgtShopAuthPageDto,List<Long> scope);
+
/**
* @description boardShopTotal
@@ -207,6 +220,27 @@
* @return void
*/
void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto);
+
+
+ /**
+ * @description 商户进件
+ * @author jqs
+ * @date 2023/6/19 11:02
+ * @param mgtShopHFTXAuthDto
+ * @return void
+ */
+ void mgtShopHFTXAuth(MgtShopHFTXAuthDto mgtShopHFTXAuthDto);
+
+
+ /**
+ * 商户进件回调异步通知
+ * @return
+ */
+ R<String> merchantBasicdataNotify(MerchantBasicDataNotifyDto dto);
+
+
+
+
/**
* @description 获取平台商户统计
@@ -234,6 +268,14 @@
* @return MgtShopAuthGetVo
*/
MgtShopAuthGetVo getMgtShopAuth(String authId);
+
+
+ /**
+ * 获取商户审核资料（汇付天下）
+ * @param shopId
+ * @return
+ */
+ MgtShopHFTXAuthGetVo getMgtShopHFTXAuthInfo(Long shopId);
/**
* @description 获取商户验证信息
@@ -385,4 +427,29 @@
* @return void
*/
void addProfitSharingReceiver(MgtShopAuthGetDto mgtShopAuthGetDto);
+
+ /**
+ * 设置分账比例
+ * @param mgtShopShareRatioSetDto
+ * @return
+ */
+ R setMgtShopShareRatio(MgtShopShareRatioSetDto mgtShopShareRatioSetDto);
+
+
+ /**
+ * 查询结算记录-第三方
+ * @param merchantBasicdataSettlementDto
+ * @return
+ */
+ R<List<MerchantBasicdataSettlementVo>> getMerchantBasicDataSettlement(MerchantBasicdataSettlementDto merchantBasicdataSettlementDto);
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/10 22:54
+ * @param cityCodes
+ * @return List<Long>
+ */
+ List<Shop> listShopByCityCode(List<String> cityCodes);
}
--
Gitblit v1.7.1