From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java |  184 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 173 insertions(+), 11 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..e0883a5 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,19 +1,23 @@
 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.shop.domain.vo.MgtShopPageVo;
+import com.ruoyi.system.api.domain.dto.MGtOneClinkSyncingShopPageDTO;
 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.config.OneClinkSyncing;
 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 org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -70,7 +74,7 @@
      * @param mgtShopPageDto
      * @return
      */
-    List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto);
+    List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto, List<Long> scope);
 
     /**
      * 获取商户详情
@@ -161,7 +165,7 @@
      * @param mgtShopListDto
      * @return  List<MgtShopListSimpleVo>
      */
-    List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto);
+    List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto,List<Long> scope);
 
     /**
      * @description  通过id获取商户列表
@@ -190,7 +194,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
@@ -199,7 +214,7 @@
     * @author jqs34
     * @date 2023/6/18 17:01
     */
-    MgtBulletinBoardVo boardShopTotal();
+    MgtBulletinBoardVo boardShopTotal(List<Long> userIds);
 
     /**
      * @description  商户进件
@@ -208,7 +223,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 +272,14 @@
      * @return  MgtShopAuthGetVo
      */
     MgtShopAuthGetVo getMgtShopAuth(String authId);
+
+
+    /**
+     * 获取商户审核资料(汇付天下)
+     * @param shopId
+     * @return
+     */
+    MgtShopHFTXAuthGetVo getMgtShopHFTXAuthInfo(Long shopId);
 
     /**
      * @description  获取商户验证信息
@@ -271,7 +315,7 @@
      * @param userId
      * @return  Shop
      */
-    Shop getShopByBelongUserId(Long userId);
+    List<Shop> getShopByBelongUserId(Long userId);
 
     /**
      * @description  员工端获取商户列表
@@ -327,4 +371,122 @@
      * @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);
+
+
+    /**
+     * 根据员工id获取对应的门店
+     * @param userIds
+     * @return
+     */
+    List<Shop> getShopBySysUserIds(List<Long> userIds);
+
+    /**
+     * 根据经销商id查询加盟商ids
+     * @param shopId
+     * @return
+     */
+    List<Shop> getFranchiseeIdsBYDealerId(Long shopId);
+    /**
+     * 修改商户类型
+     * @param shopId
+     * @return
+     */
+    R<Void> changeShopType(Long shopId);
+
+    /**
+     * 根据ids分页获取一键同步的商户信息
+     * @param dto
+     * @return
+     */
+    Page<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(MGtOneClinkSyncingShopPageDTO dto);
+
+    /**
+     * 一键同步商户信息
+     */
+    R updateShopByOneClinkSyncing(OneClinkSyncing oneClinkSyncing);
 }

--
Gitblit v1.7.1