From 9e7b5dd397e17fe141cc7630df51699125857756 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 20 六月 2023 18:35:35 +0800
Subject: [PATCH] BUG修复和营销统计
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 ae2c29a..57883a4 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,9 +8,12 @@
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.MgtBaseBathDto;
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;
@@ -51,6 +54,9 @@
@Resource
private ShopSuggestService shopSuggestService;
+
+ @Resource
+ private ShopTaskService shopTaskService;
/**
@@ -129,9 +135,29 @@
}
@PostMapping("/listShopSimpleVoByIds")
- public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(@RequestBody String shopIds)
+ public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto)
{
- List<MgtSimpleShopVo> mgtShopListSimpleVos = shopService.listShopSimpleVoByIds(shopIds);
+ List<MgtSimpleShopVo> mgtShopListSimpleVos = shopService.listShopSimpleVoByIds(mgtBaseBathDto.getIds());
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