From cd8d65c1e5378bddded25cad300f34024ba136ba Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期一, 19 六月 2023 14:33:52 +0800 Subject: [PATCH] 进件管理 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java index 9dfe764..4ae7435 100644 --- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java +++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java @@ -8,8 +8,13 @@ import com.ruoyi.shop.service.shop.ShopService; import com.ruoyi.shop.service.shop.ShopStaffService; import com.ruoyi.shop.service.shop.ShopSuggestService; +import com.ruoyi.shop.service.task.ShopTaskService; +import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto; import com.ruoyi.system.api.domain.poji.shop.Shop; import com.ruoyi.system.api.domain.poji.sys.SysUser; +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.model.QwH5LoginVo; import com.ruoyi.system.api.model.QwUserDetailDto; @@ -20,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; import java.util.Optional; /** @@ -47,6 +53,9 @@ @Resource private ShopSuggestService shopSuggestService; + + @Resource + private ShopTaskService shopTaskService; /** @@ -103,10 +112,51 @@ return R.ok(); } + /** + * @description + * @author jqs + * @date 2023/6/9 10:18 + * @param suggestTag + * @return R + */ @PostMapping("/deleteShopSuggestTag") - public R deleteShopSuggestTag(@RequestBody String tag) + public R deleteShopSuggestTag(@RequestBody String suggestTag) { - shopSuggestService.deleteShopSuggestTag(tag); + shopSuggestService.deleteShopSuggestTag(suggestTag); return R.ok(); } + + @PostMapping("/getShopIdByCode") + public R<MgtShopIdByCodeVo> getShopIdByCode(@RequestBody MgtShopIdByCodeDto mgtShopIdByCodeDto) + { + MgtShopIdByCodeVo mgtShopIdByCodeVo = shopService.getShopIdByCode(mgtShopIdByCodeDto); + return R.ok(mgtShopIdByCodeVo); + } + + @PostMapping("/listShopSimpleVoByIds") + public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(@RequestBody String shopIds) + { + List<MgtSimpleShopVo> mgtShopListSimpleVos = shopService.listShopSimpleVoByIds(shopIds); + return R.ok(mgtShopListSimpleVos); + } + + /** + * @description boardShopTotal + * @param + * @return R<MgtBulletinBoardVo> + * @author jqs34 + * @date 2023/6/18 16:45 + */ + @PostMapping("/boardShopTotal") + public R<MgtBulletinBoardVo> boardShopTotal() + { + MgtBulletinBoardVo bulletinBoardVo = new MgtBulletinBoardVo(); + MgtBulletinBoardVo bulletinBoardVoShop = shopService.boardShopTotal(); + MgtBulletinBoardVo bulletinBoardVoTask = shopTaskService.boardTaskTotal(); + bulletinBoardVo.setShopTotal(bulletinBoardVoShop.getShopTotal()); + bulletinBoardVo.setDealerTotal(bulletinBoardVoShop.getDealerTotal()); + bulletinBoardVo.setAgencyTotal(bulletinBoardVoShop.getAgencyTotal()); + bulletinBoardVo.setFollowShopToday(bulletinBoardVoTask.getFollowShopToday()); + return R.ok(bulletinBoardVo); + } } -- Gitblit v1.7.1