From 046d7ac5bbef4cbb6c6b64f3589e2722d13a07a5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 27 六月 2023 11:00:01 +0800
Subject: [PATCH] 日志管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 108 insertions(+), 4 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 b49b87f..ce8ad2e 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
@@ -2,23 +2,32 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.security.annotation.InnerAuth;
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.system.api.domain.poji.activity.ActivityGoods;
+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.MgtBasePlatformDto;
+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;
import com.ruoyi.system.api.service.RemoteUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Optional;
/**
@@ -43,6 +52,13 @@
@Resource
private RemoteUserService remoteUserService;
+
+ @Resource
+ private ShopSuggestService shopSuggestService;
+
+ @Resource
+ private ShopTaskService shopTaskService;
+
/**
* 企业微信H5登录
@@ -84,5 +100,93 @@
return R.ok(shopRelUserVo);
}
+ /**
+ * @description 删除商户标签
+ * @author jqs
+ * @date 2023/6/8 15:52
+ * @param tag
+ * @return R
+ */
+ @PostMapping("/deleteShopTag")
+ public R deleteShopTag(@RequestBody String tag)
+ {
+ shopService.deleteShopTag(tag);
+ return R.ok();
+ }
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/9 10:18
+ * @param suggestTag
+ * @return R
+ */
+ @PostMapping("/deleteShopSuggestTag")
+ public R deleteShopSuggestTag(@RequestBody String suggestTag)
+ {
+ shopSuggestService.deleteShopSuggestTag(suggestTag);
+ 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)
+ {
+ MgtShopIdByCodeVo mgtShopIdByCodeVo = shopService.getShopIdByCode(mgtShopIdByCodeDto);
+ 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 MgtBaseBathDto mgtBaseBathDto)
+ {
+ 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);
+ }
+
+ /**
+ * @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);
+ }
}
--
Gitblit v1.7.1