bug修复

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/WeChatMessageServiceImpl.java

@@ -115,7 +115,7 @@ public class WeChatMessageServiceImpl implements IWeChatMessageService {
             // 事件类型
             String event = requestMap.get("Event");
             StringBuilder contentMessage = new StringBuilder();
-            String contentStr = "嗨，欢迎加入通告快捷，您想咨询那个问题，请点击选择";
+            String contentStr = "嗨，欢迎加入通告快接，您想咨询那个问题，请点击选择";
             String jqHtml = "1111";
             String xsHtml = "1111";
             String tgzHtml = "https://www.ddtg.site/pages/mine/member/member-card?userType=01";

ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java

@@ -42,6 +42,7 @@ import com.ruoyi.member.domain.MemberApply;
 import com.ruoyi.member.domain.MemberPoints;
 import com.ruoyi.member.domain.MemberUser;
 import com.ruoyi.member.service.*;
+import com.ruoyi.member.vo.MemberUserVO;
 import com.ruoyi.payConfig.WechatPayConfig;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysDictDataService;
@@ -156,7 +157,8 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
             }
             data.setCreateTime(new Date());
             this.save(data);
-            if(data.getApprovalStatus().equals("1")){
+            MemberUserVO memberUserVO = memberUserService.queryByUserId(SecurityUtils.getUserId(), "01");
+            if(data.getApprovalStatus().equals("1")&&StringUtils.isNotEmpty(memberUserVO.getIdentityType())&&memberUserVO.getIdentityType().equals("05")){
                 //如果审核通过
                 //从配置表中获取积分
                 MemberPoints memberPoints =new MemberPoints();
@@ -339,13 +341,15 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
                 //删除结尾的最后一个逗号
                 data.setSimilarityIds(data.getSimilarityIds().substring(0, data.getSimilarityIds().length() - 1));
             }
-            //如果审核通过
+            MemberUserVO memberUserVO = memberUserService.queryByUserId(data.getUserId(), "01");
-            MemberPoints memberPoints =new MemberPoints();
+            if (StringUtils.isNotEmpty(memberUserVO.getIdentityType())&&memberUserVO.getIdentityType().equals("05")){
-            memberPoints.setUserId(SecurityUtils.getUserId());
+                //如果审核通过
-            memberPoints.setType("1");
+                MemberPoints memberPoints =new MemberPoints();
-            memberPoints.setFromCode("fbgg");
+                memberPoints.setUserId(data.getUserId());
-            memberPointsService.savePoints(memberPoints);
+                memberPoints.setType("1");
-
+                memberPoints.setFromCode("fbgg");
+                memberPointsService.savePoints(memberPoints);
+            }
         }else {
             //如果是关闭 关闭状态
             data.setApprovalStatus("2");
@@ -583,7 +587,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
             return pageList;
         }else {
             //未设置订阅则使用常规查询
-            return this.queryAppListPage(query,page);
+            return new Page<>();
         }
 
     }

ruoyi-admin/src/main/java/com/ruoyi/busi/vo/SubscribeDataObj.java

@@ -1,5 +1,6 @@
 package com.ruoyi.busi.vo;
 
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 
 import java.util.List;
@@ -31,4 +32,9 @@ public class SubscribeDataObj {
         //
         private Boolean newNotice;
         private Boolean forkNotice;
+        /**
+         * 是否急招0否1是
+         */
+        private String isUrgent;
+        private Integer isPlatformFree;
 }

ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java

@@ -165,7 +165,7 @@ public class MemberUserController extends BaseController {
      */
     @Log(title = "赠送新人好礼", businessType = BusinessType.INSERT)
     @PostMapping("/sendNewGift")
-    public AjaxResult sendNewGift() {
+    public AjaxResult sendNewGift() throws Exception {
         memberUserService.sendNewGift();
         return success();
     }

ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java

@@ -87,7 +87,7 @@ public interface IMemberUserService extends IService<MemberUser> {
      * @date 15:55 2025/3/26
      **/
     String gzhLogin(String wxOpenId,  JSONObject userInfo);
-    void sendNewGift();
+    void sendNewGift() throws Exception;
     /**
      * 判断是否领取过新人好礼
      */

ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java

@@ -322,7 +322,11 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
     }
     //新人好礼
     @Override
-    public void sendNewGift() {
+    public void sendNewGift() throws Exception {
+        Object getGift = this.isGetGift();
+        if ("1".equals(getGift)){
+            throw new Exception("已领取过");
+        }
         //赠送博主报名次数
         List<BaseConfig> sendNewGift = baseConfigService.queryConfigByCode("send_new_gift");
         if(CollectionUtil.isNotEmpty(sendNewGift)){

ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml

@@ -99,6 +99,7 @@
         main.trecipient_image AS trecipientImage,
         main.bpoints AS bpoints,
         main.send_report_num as sendReportNum,
+        main.is_get_gift as isGetGift,
         su.nick_name AS nickName,
         su.status AS status,
         su.avatar AS avatar,