From f79a327bd4e5d1511ac3b738530b0f5c63772aec Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 04 九月 2023 19:34:35 +0800
Subject: [PATCH] seata 同步 支付调整
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 22 ++++++++++++++++++----
1 files changed, 18 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 fdc0a46..c36aa00 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
@@ -94,7 +94,7 @@
if(shop.getFrozenFlag()==1){
String userKey = SecurityUtils.getUserKey();
redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
- throw new ServiceException("商户已被冻结",401);
+ throw new ServiceException("商户已被冻结,请联系管理员",401);
}
// 构造登录返回信息
QwH5LoginVo qwH5LoginVo = new QwH5LoginVo();
@@ -150,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);
}
@@ -359,4 +359,18 @@
shopService.authShop();
return R.ok();
}
+
+ /**
+ * @description 获取今日任务通知列表
+ * @author jqs
+ * @date 2023/8/29 15:03
+ * @param
+ * @return R<List<MgtUserTaskMsgVo>>
+ */
+ @PostMapping("/getTaskMsgList")
+ R<List<MgtUserTaskMsgVo>> getTaskMsgList(){
+ List<MgtUserTaskMsgVo> userTaskMsgVoList = shopService.getTaskMsgList();
+ return R.ok(userTaskMsgVoList);
+ }
+
}
--
Gitblit v1.7.1