From c97706c3cc213b7db3d381e8a0435ff0ef9a04d6 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期一, 04 九月 2023 18:53:40 +0800 Subject: [PATCH] seata 同步 支付调整 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 74 +++++++++++++++++++++++++++++++++--- 1 files changed, 67 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 b334032..75f51f2 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 @@ -2,16 +2,16 @@ 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.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 com.ruoyi.system.api.domain.vo.*; import java.util.List; @@ -111,10 +111,10 @@ /** * 获取商户端首页统计 - * @param userId + * @param merBaseDto * @return */ - MerHomeShopTotalVo getMerHomeTotal(Long userId); + MerHomeShopTotalVo getMerHomeTotal(MerBaseDto merBaseDto); /** * 商户获取代理商列表 @@ -269,7 +269,7 @@ * @param userId * @return Shop */ - Shop getShopByBelongUserId(Long userId); + List<Shop> getShopByBelongUserId(Long userId); /** * @description 员工端获取商户列表 @@ -325,4 +325,64 @@ * @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); } -- Gitblit v1.7.1