From 6ab383249b70a9646ffde1474b59dcc7d0b97df6 Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期日, 06 八月 2023 15:05:15 +0800 Subject: [PATCH] bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java | 96 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 90 insertions(+), 6 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java index 354d434..f849c0f 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java @@ -2,12 +2,10 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto; +import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.poji.shop.Shop; -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.ShopRelUserVo; +import com.ruoyi.system.api.domain.poji.shop.ShopProportionVo; +import com.ruoyi.system.api.domain.vo.*; import com.ruoyi.system.api.factory.RemoteShopFallbackFactory; import com.ruoyi.system.api.model.QwH5LoginVo; import com.ruoyi.system.api.model.QwUserDetailDto; @@ -22,6 +20,10 @@ @PostMapping("/shop/getShop") public R<Shop> getShop(@RequestBody Long shopId); + + @PostMapping("/shop/getShopSubMchId") + public R<String> getShopSubMchId(@RequestBody Long shopId); + @PostMapping("/shop/getShopByUserId") public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId); @@ -67,7 +69,7 @@ @PostMapping("/shop/listShopSimpleVoByIds") - public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(@RequestBody String shopIds); + public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto); /** * @description boardShopTotal @@ -78,4 +80,86 @@ */ @PostMapping("/shop/boardShopTotal") public R<MgtBulletinBoardVo> boardShopTotal(); + + /** + * @description 获取平台统计shopId + * @param mgtBasePlatformDto + * @return R<List<Long>> + * @author jqs34 + * @date 2023/6/23 14:12 + */ + @PostMapping("/shop/listShopIdByPlTotal") + public R<List<Long>> listShopIdByPlTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto); + + + /** + * @description 更新商户统计 + * @author jqs + * @date 2023/6/28 17:52 + * @param shopTotalChangeDto + * @return R + */ + @PostMapping("/shop/changeShopTotal") + public R changeShopTotal(@RequestBody ShopTotalChangeDto shopTotalChangeDto); + + /** + * @description 获取最近任务 + * @author jqs + * @date 2023/6/29 18:25 + * @param userId + * @return R<MemberTaskSimpleVo> + */ + @PostMapping("/shop/getLastMemberTask") + public R<MemberTaskSimpleVo> getLastMemberTask(@RequestBody Long userId); + + /** + * @description 获取商户下属代理商 + * @author jqs + * @date 2023/7/3 17:26 + * @return R<List<Long>> + */ + @PostMapping("/shop/listShopIdByShopId") + public R<List<Long>> listShopIdByShopId(@RequestBody Long shopId); + + /** + * @description 获取未回复数量 + * @author jqs + * @date 2023/7/5 12:49 + * @param + * @return R<Integer> + */ + @PostMapping("/shop/getUnReplaySuggestVo") + public R<Integer> getUnReplaySuggestVo(); + + /** + * @description 获取商户营销状态 + * @author jqs + * @date 2023/7/7 14:05 + * @param shopId + * @return R<Integer> + */ + @PostMapping("/shop/getShopMarketingStatus") + public R<Integer> getShopMarketingStatus(@RequestBody Long shopId); + + @PostMapping("/shop/getShopByBelongUserId") + public R<ShopRelUserVo> getShopByBelongUserId(@RequestBody Long userId); + + + /** + * @description 修改商户员工 + * @author jqs + * @date 2023/7/19 19:02 + * @param mgtShopStaffEditDto + * @return R + */ + @PostMapping("/shop/editMgtShopStaff") + public R editMgtShopStaff(@RequestBody MgtShopStaffEditDto mgtShopStaffEditDto); + + /** + * 获取商户分成 + * @param shopId + * @return + */ + @PostMapping("/shop/getShopProportion") + R<ShopProportionVo> getShopProportion(@RequestBody Long shopId); } -- Gitblit v1.7.1