From a016ab9f97b76c3b4905b890662d344d47f24005 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 28 六月 2023 18:25:14 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 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 4ae7435..7efb9b5 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
@@ -4,12 +4,9 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
-import com.ruoyi.shop.service.shop.ShopRelUserService;
-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.shop.*;
import com.ruoyi.shop.service.task.ShopTaskService;
-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.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
@@ -56,6 +53,9 @@
@Resource
private ShopTaskService shopTaskService;
+
+ @Resource
+ private ShopTotalService shopTotalService;
/**
@@ -126,6 +126,13 @@
return R.ok();
}
+ /**
+ * @description 通过区域代码获取shopId
+ * @author jqs
+ * @date 2023/6/21 15:50
+ * @param mgtShopIdByCodeDto
+ * @return R<MgtShopIdByCodeVo>
+ */
@PostMapping("/getShopIdByCode")
public R<MgtShopIdByCodeVo> getShopIdByCode(@RequestBody MgtShopIdByCodeDto mgtShopIdByCodeDto)
{
@@ -133,10 +140,17 @@
return R.ok(mgtShopIdByCodeVo);
}
+ /**
+ * @description 通过id获取商户简易信息list
+ * @author jqs
+ * @date 2023/6/21 15:50
+ * @param mgtBaseBathDto
+ * @return R<List<MgtSimpleShopVo>>
+ */
@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);
}
@@ -159,4 +173,33 @@
bulletinBoardVo.setFollowShopToday(bulletinBoardVoTask.getFollowShopToday());
return R.ok(bulletinBoardVo);
}
+
+ /**
+ * @description 获取平台统计shopId
+ * @param mgtBasePlatformDto
+ * @return R<List<Long>>
+ * @author jqs34
+ * @date 2023/6/23 14:14
+ */
+ @PostMapping("/listShopIdByPlTotal")
+ public R<List<Long>> listShopIdByPlTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto)
+ {
+ List<Long> shopIdList = shopService.listShopIdByPlTotal(mgtBasePlatformDto);
+ return R.ok(shopIdList);
+ }
+
+
+ /**
+ * @description 更新商户统计
+ * @author jqs
+ * @date 2023/6/28 17:52
+ * @param shopTotalChangeDto
+ * @return R
+ */
+ @PostMapping("/changeShopTotal")
+ public R changeShopTotal(@RequestBody ShopTotalChangeDto shopTotalChangeDto)
+ {
+ shopTotalService.changeShopTotal(shopTotalChangeDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1