From 7f0bcc9c2a463b52dbacc6bc9ea9d497925c6f23 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Tue, 6 May 2025 14:05:51 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/busi/controller/BusiNoticeController.java |  3 +--
 .../com/ruoyi/busi/service/IBusiNoticeService.java  |  2 +-
 .../busi/service/impl/BusiNoticeServiceImpl.java    | 13 ++++++++++---
 .../member/controller/MemberUserController.java     | 10 ++++++++++
 .../java/com/ruoyi/member/domain/MemberUser.java    |  4 ++++
 .../ruoyi/member/service/IMemberUserService.java    |  4 ++++
 .../member/service/impl/MemberUserServiceImpl.java  | 10 ++++++++++
 7 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java
index dabe2cf..7a7747f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java
@@ -116,8 +116,7 @@ public class BusiNoticeController extends BaseController
     @Log(title = "通告", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BusiNotice busiNotice) throws Exception {
-        busiNoticeService.saveVo(busiNotice);
-        return success();
+        return success( busiNoticeService.saveVo(busiNotice));
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java
index b8965d3..9bfb17b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java
@@ -41,7 +41,7 @@ public interface IBusiNoticeService extends IService<BusiNotice>
      * 保存
      * @param data 保存参数
      */
-    void saveVo(BusiNotice data) throws Exception;
+    JSONObject saveVo(BusiNotice data) throws Exception;
     /**
      * 更新
      * @param data 保存参数
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
index c082a27..eaf6795 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
@@ -114,12 +114,17 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
      * @param data 通告对象
      */
     @Override
-    public void saveVo(BusiNotice data) throws Exception {
+    public JSONObject saveVo(BusiNotice data) throws Exception {
+        JSONObject result = new JSONObject();
+        result.put("code",0);
+        result.put("msg","自动审核通过，发布成功");
         //获取当前登录用户
         data.setUserId(SecurityUtils.getUserId());
         if (StringUtils.isNotEmpty(data.getApprovalStatus())&&data.getApprovalStatus().equals("8")){
             //草稿数据直接保存
             this.save(data);
+            result.put("code",100);
+            result.put("msg","草稿数据暂存成功");
         }else {
             //判断 内容重复度 是否大于70%
             //先获取 当前系统中截止日期之前的
@@ -143,6 +148,8 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
                     data.setApprovalStatus("0");
                     data.setApprovalTime(null);
                     data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+",");
+                    result.put("code",500);
+                    result.put("msg","该通告已被人抢先一步上传，等待平台审核");
                 }
             }
             if (StringUtils.isNotEmpty(data.getSimilarityIds())){
@@ -187,8 +194,8 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
             //进行模版消息通知
             sendNoticeMsg(data);
         }
-
-
+        result.put("noticeId",data.getId());
+        return result;
     }
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java
index 05f4f8d..9b4d4a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java
@@ -168,4 +168,14 @@ public class MemberUserController extends BaseController {
         memberUserService.sendNewGift();
         return success();
     }
+
+    /**
+     * 判断是否领取过新人好礼
+     */
+    @Log(title = "判断是否领取过新人好礼", businessType = BusinessType.INSERT)
+    @PostMapping("/isGetGift")
+    public AjaxResult isGetGift() {
+
+        return success(memberUserService.isGetGift());
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java
index db1a825..d5514b7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java
@@ -76,6 +76,10 @@ public class MemberUser extends DlBaseEntity
      * 博主剩余报名次数
      */
     private Long sendReportNum;
+    /**
+     * 判断是否领过0否1是
+     */
+    private String isGetGift;
 
 
     public MemberUser (String userType, SysUser user,Integer addNotice){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java
index 3e38a5b..1227c0b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java
@@ -88,5 +88,9 @@ public interface IMemberUserService extends IService<MemberUser> {
      **/
     String gzhLogin(String wxOpenId,  JSONObject userInfo);
     void sendNewGift();
+    /**
+     * 判断是否领取过新人好礼
+     */
+    Object isGetGift();
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
index f217c9a..c608a83 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
@@ -330,7 +330,17 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
             //博主，通告主基本信息
             MemberUserVO result = memberUserMapper.queryByUserId(userId, "02");
             result.setSendReportNum(result.getSendReportNum()+sendReportNum);
+            result.setIsGetGift("1");
             memberUserMapper.updateById(result);
         }
     }
+    /**
+     * 判断是否领取过新人好礼
+     */
+    @Override
+    public Object isGetGift() {
+        Long userId = SecurityUtils.getUserId();
+        MemberUserVO result = memberUserMapper.queryByUserId(userId, "02");
+        return result.getIsGetGift();
+    }
 }