From 32bd52ec49d25021b6a35d8ee5f32c70df788165 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 05 七月 2023 21:30:21 +0800
Subject: [PATCH] bug 用户端
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 200 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 b266dd7..5845baa 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,17 +2,28 @@
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.service.shop.ShopRelUserService;
-import com.ruoyi.shop.service.shop.ShopService;
-import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
+import com.ruoyi.shop.service.shop.*;
+import com.ruoyi.shop.service.task.MemberTaskService;
+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.dto.ShopTotalChangeDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.domain.vo.*;
+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;
/**
@@ -32,6 +43,44 @@
@Resource
private ShopRelUserService shopRelUserService;
+ @Resource
+ private ShopStaffService shopStaffService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
+
+ @Resource
+ private ShopSuggestService shopSuggestService;
+
+ @Resource
+ private ShopTaskService shopTaskService;
+
+ @Resource
+ private ShopTotalService shopTotalService;
+
+ @Resource
+ private MemberTaskService memberTaskService;
+
+ /**
+ * 企业微信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)
@@ -52,5 +101,149 @@
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);
+ }
+
+
+ /**
+ * @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();
+ }
+
+ /**
+ * @description 获取最近任务
+ * @author jqs
+ * @date 2023/6/29 18:25
+ * @param userId
+ * @return R<MemberTaskSimpleVo>
+ */
+ @PostMapping("/getLastMemberTask")
+ public R<MemberTaskSimpleVo> getLastMemberTask(@RequestBody Long userId)
+ {
+ MemberTaskSimpleVo taskSimpleVo = memberTaskService.getLastMemberTask(userId);
+ return R.ok(taskSimpleVo);
+ }
+
+ /**
+ * @description 获取商户下属代理商
+ * @author jqs
+ * @date 2023/7/3 17:26
+ * @return R<List<Long>>
+ */
+ @PostMapping("/listShopIdByShopId")
+ public R<List<Long>> listShopIdByShopId(@RequestBody Long shopId)
+ {
+ List<Long> shopIdList = shopService.listShopIdByShopId(shopId);
+ return R.ok(shopIdList);
+ }
+
+ /**
+ * @description 获取未回复数量
+ * @author jqs
+ * @date 2023/7/5 12:49
+ * @param
+ * @return R<Integer>
+ */
+ @PostMapping("/getUnReplaySuggestVo")
+ public R<Integer> getUnReplaySuggestVo()
+ {
+ Integer count = shopSuggestService.getUnReplaySuggestVo();
+ return R.ok(count);
+ }
}
--
Gitblit v1.7.1