From 1695aa136a89421b1cff75d672888e81d2a24d9a Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 29 八月 2023 18:30:23 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 1b8986b..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();
@@ -360,4 +360,17 @@
         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