From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 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 e75e7ca..b8ad4ff 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,10 +7,8 @@
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.constant.AppErrorConstant;
+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.*;
@@ -71,6 +69,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 +99,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);
}
@@ -233,5 +244,55 @@
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);
+ }
+
+ /**
+ * @description 修改商户员工
+ * @author jqs
+ * @date 2023/7/19 19:02
+ * @param mgtShopStaffEditDto
+ * @return R
+ */
+ @PostMapping("/editMgtShopStaff")
+ public R editMgtShopStaff(@RequestBody MgtShopStaffEditDto mgtShopStaffEditDto)
+ {
+ shopStaffService.editMgtShopStaff(mgtShopStaffEditDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1