From cc1181b93c51c60a117846f9640d3f56370e67f3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:32:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 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 5845baa..cd42728 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("登录失败，未查询到用户"));
@@ -94,10 +95,20 @@
public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId)
{
ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
- Optional.ofNullable(shopRelUser).orElseThrow(() -> new ServiceException("未查询到商户信息"));
+ Optional.ofNullable(shopRelUser).orElseThrow(() -> new ServiceException("未查询到用户关联商户"));
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);
}
@@ -246,4 +257,42 @@
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==2){
+ marketingStatus = 1;
+ }else if(platformCouponFlag==2&&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