From dc600db1211ba96302c2f75b4dd224512aad89cf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 19 一月 2024 15:32:09 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 138 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 7 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 5a664f1..9e8683a 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,8 +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.exception.WxPayException;
+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;
@@ -10,10 +13,7 @@
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 com.ruoyi.system.api.domain.vo.*;
import java.util.List;
@@ -192,6 +192,16 @@
*/
List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto);
+
+ /**
+ * 商户进件列表数据（汇付天下）
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return
+ */
+ List<MgtShopHFTXAuthPageVo> pageMgtShopHFTXAuth(Page page, MgtShopHFTXAuthPageDto mgtShopAuthPageDto);
+
+
/**
* @description boardShopTotal
* @param
@@ -208,7 +218,28 @@
* @param mgtShopAuthDto
* @return void
*/
- void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) throws WxPayException;
+ 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 获取平台商户统计
@@ -236,6 +267,14 @@
* @return MgtShopAuthGetVo
*/
MgtShopAuthGetVo getMgtShopAuth(String authId);
+
+
+ /**
+ * 获取商户审核资料（汇付天下）
+ * @param shopId
+ * @return
+ */
+ MgtShopHFTXAuthGetVo getMgtShopHFTXAuthInfo(Long shopId);
/**
* @description 获取商户验证信息
@@ -271,7 +310,7 @@
* @param userId
* @return Shop
*/
- Shop getShopByBelongUserId(Long userId);
+ List<Shop> getShopByBelongUserId(Long userId);
/**
* @description 员工端获取商户列表
@@ -327,4 +366,89 @@
* @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);
+
+ /**
+ * @description 提交进件
+ * @author jqs
+ * @date 2023/8/22 14:51
+ * @param
+ * @return void
+ */
+ void authShop();
+
+ /**
+ * @description 修改店铺详细资料
+ * @author jqs
+ * @date 2023/8/22 14:51
+ * @param staffShopDetailDto
+ * @return void
+ */
+ void editShopDetail(StaffShopDetailDto staffShopDetailDto);
+
+ /**
+ * @description 获取店铺详细资料
+ * @author jqs
+ * @date 2023/8/22 16:15
+ * @param shopId
+ * @return StaffShopDetailVo
+ */
+ StaffShopDetailVo getShopDetail(Long shopId);
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/29 14:36
+ * @param
+ * @return List<MgtUserTaskMsgVo>
+ */
+ List<MgtUserTaskMsgVo> getTaskMsgList();
+
+ /**
+ * @description 添加分账方
+ * @author jqs
+ * @date 2023/9/4 18:14
+ * @param mgtShopAuthGetDto
+ * @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