From 2e9c442b4961dc30423e8b8fa1361c45e63ef620 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 16 八月 2023 19:52:00 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 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 cd42728..fdc0a46 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,7 +1,13 @@
package com.ruoyi.shop.controller.console;
+import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.shop.domain.pojo.shop.ShopAuthentication;
+import com.ruoyi.shop.domain.pojo.shop.ShopProportion;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.shop.service.shop.*;
@@ -10,6 +16,7 @@
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.shop.ShopProportionVo;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.QwH5LoginVo;
@@ -59,6 +66,14 @@
@Resource
private MemberTaskService memberTaskService;
+ @Resource
+ private ShopAuthenticationService shopAuthenticationService;
+
+ @Resource
+ private ShopProportionService shopProportionService;
+
+ @Resource
+ private RedisService redisService;
/**
* 企业微信H5登录
* @param qwUserDetail
@@ -75,6 +90,12 @@
Long userId = shopStaff.getUserId();
SysUser sysUser = remoteUserService.getSysUser(userId).getData();
Optional.ofNullable(sysUser).orElseThrow(() -> new ServiceException("登录失败，未查询到用户"));
+ Shop shop = shopService.getByShopId(shopStaff.getShopId());
+ if(shop.getFrozenFlag()==1){
+ String userKey = SecurityUtils.getUserKey();
+ redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
+ throw new ServiceException("商户已被冻结",401);
+ }
// 构造登录返回信息
QwH5LoginVo qwH5LoginVo = new QwH5LoginVo();
qwH5LoginVo.setUserid(qwUserDetail.getUserid());
@@ -90,6 +111,30 @@
return R.ok(shop);
}
+ @PostMapping("/getShopSubMchId")
+ public R<String> getShopSubMchId(@RequestBody Long shopId){
+ String subMchid = "";
+ ShopAuthentication authentication = shopAuthenticationService.getByShopId(shopId);
+ if(null != authentication){
+ subMchid = authentication.getSubMchid();
+ }
+ return R.ok(subMchid, "");
+ }
+
+
+ /**
+ * 获取商户分成
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/getShopProportion")
+ public R<ShopProportionVo> getShopProportion(@RequestBody Long shopId){
+ ShopProportion shopProportion = shopProportionService.getByShopId(shopId);
+
+ ShopProportionVo shopProportionVo = new ShopProportionVo();
+ BeanUtils.copyBeanProp(shopProportionVo, shopProportion);
+ return R.ok(shopProportionVo);
+ }
@PostMapping("/getShopByUserId")
public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId)
@@ -295,4 +340,23 @@
shopStaffService.editMgtShopStaff(mgtShopStaffEditDto);
return R.ok();
}
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/10 23:01
+ * @param cityCodes
+ * @return R<List<Long>>
+ */
+ @PostMapping("/listShopIdByCityCode")
+ R<List<Long>> listShopIdByCityCode(@RequestBody List<String> cityCodes){
+ List<Long> shopIdList = shopService.listShopIdByCityCode(cityCodes);
+ return R.ok(shopIdList);
+ }
+
+ @PostMapping("/authShop")
+ R authShop(){
+ shopService.authShop();
+ return R.ok();
+ }
}
--
Gitblit v1.7.1