From 3ea9caae29421bcc6f21283e3f1d52c2bf967a4c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 19 七月 2023 11:02:01 +0800
Subject: [PATCH] bug和企业微信同步
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 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 b875415..bb5cf8e 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
@@ -7,6 +7,7 @@
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.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
@@ -71,6 +72,9 @@
{
String mobile = qwUserDetail.getMobile();
ShopStaff shopStaff = shopStaffService.getByMobile(mobile);
+ if(shopStaff==null){
+ throw new ServiceException(AppErrorConstant.USER_NO_SHOP);
+ }
Long userId = shopStaff.getUserId();
SysUser sysUser = remoteUserService.getSysUser(userId).getData();
Optional.ofNullable(sysUser).orElseThrow(() -> new ServiceException("登录失败，未查询到用户"));
@@ -98,6 +102,16 @@
ShopRelUserVo shopRelUserVo = new ShopRelUserVo();
shopRelUserVo.setShopId(shopRelUser.getShopId());
shopRelUserVo.setUserName(shopRelUser.getUserName());
+ return R.ok(shopRelUserVo);
+ }
+
+ @PostMapping("/getShopByBelongUserId")
+ public R<ShopRelUserVo> getShopByBelongUserId(@RequestBody Long userId)
+ {
+ Shop shop = shopService.getShopByBelongUserId(userId);
+ Optional.ofNullable(shop).orElseThrow(() -> new ServiceException("未查询到商户信息"));
+ ShopRelUserVo shopRelUserVo = new ShopRelUserVo();
+ shopRelUserVo.setShopId(shop.getShopId());
return R.ok(shopRelUserVo);
}
@@ -220,4 +234,56 @@
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);
+ }
+
+ /**
+ * @description 获取商户营销状态
+ * @author jqs
+ * @date 2023/7/7 14:05
+ * @param shopId
+ * @return R<Integer>
+ */
+ @PostMapping("/getShopMarketingStatus")
+ public R<Integer> getShopMarketingStatus(@RequestBody Long shopId)
+ {
+ Shop shop = shopService.getByShopId(shopId);
+ Integer platformCouponFlag = shop.getPlatformCouponFlag();
+ Integer platformBirthdayFlag = shop.getPlatformBirthdayFlag();
+ Integer marketingStatus = 0;
+ if(platformCouponFlag==1&&platformBirthdayFlag==0){
+ marketingStatus = 1;
+ }else if(platformCouponFlag==0&&platformBirthdayFlag==1){
+ marketingStatus = 2;
+ }else if(platformCouponFlag==1&&platformBirthdayFlag==1){
+ marketingStatus = 3;
+ }
+ return R.ok(marketingStatus);
+ }
+
+
}
--
Gitblit v1.7.1