From 156e141e55a8abf486157d1fa89d25e23f4a06a3 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期五, 25 八月 2023 19:32:30 +0800 Subject: [PATCH] bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java | 68 +++++++++++++++++++++++++++++++--- 1 files changed, 62 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 eba5c59..d583428 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,11 +2,9 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.dto.MgtBaseBathDto; -import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto; -import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto; -import com.ruoyi.system.api.domain.dto.ShopTotalChangeDto; +import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.poji.shop.Shop; +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; @@ -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); @@ -97,7 +99,7 @@ * @param shopTotalChangeDto * @return R */ - @PostMapping("/changeShopTotal") + @PostMapping("/shop/changeShopTotal") public R changeShopTotal(@RequestBody ShopTotalChangeDto shopTotalChangeDto); /** @@ -107,6 +109,60 @@ * @param userId * @return R<MemberTaskSimpleVo> */ - @PostMapping("/member/getLastMemberTask") + @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); + + @PostMapping("/shop/listShopIdByCityCode") + R<List<Long>> listShopIdByCityCode(@RequestBody List<String> cityCodes); } -- Gitblit v1.7.1