From c00d0d3bc399b6648145dfd955cedbea90f5f99d Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期日, 18 六月 2023 17:38:22 +0800 Subject: [PATCH] 看板 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 135 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 130 insertions(+), 5 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 c168846..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 @@ -1,15 +1,32 @@ package com.ruoyi.shop.controller.console; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.security.annotation.InnerAuth; +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.system.api.domain.poji.activity.ActivityGoods; +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 org.springframework.beans.factory.annotation.Autowired; +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.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; /** * @author jqs34 @@ -22,10 +39,46 @@ @RequestMapping("/shop") public class ShopController { - @Autowired + @Resource private ShopService shopService; - @InnerAuth + @Resource + private ShopRelUserService shopRelUserService; + + @Resource + private ShopStaffService shopStaffService; + + @Resource + private RemoteUserService remoteUserService; + + @Resource + private ShopSuggestService shopSuggestService; + + @Resource + private ShopTaskService shopTaskService; + + + /** + * 企业微信H5登录 + * @param qwUserDetail + * @return + */ + @PostMapping("/qwH5Login") + public R<QwH5LoginVo> qwH5Login(@RequestBody QwUserDetailDto qwUserDetail) + { + String mobile = qwUserDetail.getMobile(); + ShopStaff shopStaff = shopStaffService.getByMobile(mobile); + Long userId = shopStaff.getUserId(); + SysUser sysUser = remoteUserService.getSysUser(userId).getData(); + Optional.ofNullable(sysUser).orElseThrow(() -> new ServiceException("登录失败,未查询到用户")); + // 构造登录返回信息 + QwH5LoginVo qwH5LoginVo = new QwH5LoginVo(); + qwH5LoginVo.setUserid(qwUserDetail.getUserid()); + qwH5LoginVo.setMobile(qwUserDetail.getMobile()); + qwH5LoginVo.setSysUser(sysUser); + return R.ok(qwH5LoginVo); + } + @PostMapping("/getShop") public R<Shop> getShop(@RequestBody Long shopId) { @@ -34,4 +87,76 @@ } + @PostMapping("/getShopByUserId") + public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId) + { + ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId); + Optional.ofNullable(shopRelUser).orElseThrow(() -> new ServiceException("未查询到商户信息")); + ShopRelUserVo shopRelUserVo = new ShopRelUserVo(); + shopRelUserVo.setShopId(shopRelUser.getShopId()); + shopRelUserVo.setUserName(shopRelUser.getUserName()); + 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(); + } + + @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