From 8a02b254c772e86d1c70d78b3753de1969b5c4bc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:00 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 12 +++---------
1 files changed, 3 insertions(+), 9 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 1b8ca88..1b8986b 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,6 +1,5 @@
package com.ruoyi.shop.controller.console;
-import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingReceiver;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
@@ -151,10 +150,10 @@
@PostMapping("/getShopByBelongUserId")
public R<ShopRelUserVo> getShopByBelongUserId(@RequestBody Long userId)
{
- Shop shop = shopService.getShopByBelongUserId(userId);
- Optional.ofNullable(shop).orElseThrow(() -> new ServiceException("未查询到商户信息"));
+ List<Shop> shopList = shopService.getShopByBelongUserId(userId);
+ Optional.ofNullable(shopList.get(0)).orElseThrow(() -> new ServiceException("未查询到商户信息"));
ShopRelUserVo shopRelUserVo = new ShopRelUserVo();
- shopRelUserVo.setShopId(shop.getShopId());
+ shopRelUserVo.setShopId(shopList.get(0).getShopId());
return R.ok(shopRelUserVo);
}
@@ -361,9 +360,4 @@
return R.ok();
}
- @PostMapping("/addProfitSharingReceiver")
- R authShop(@RequestBody ProfitSharingReceiver profitSharingReceiver){
- shopService.addProfitSharingReceiver(profitSharingReceiver);
- return R.ok();
- }
}
--
Gitblit v1.7.1