diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/WeChatMessageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/WeChatMessageServiceImpl.java index a75d8fa..ad309ce 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/WeChatMessageServiceImpl.java +++ b/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"; 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 d8ab485..dfebaac 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 @@ -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(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/SubscribeDataObj.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/SubscribeDataObj.java index 854a7fb..5ffc7c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/SubscribeDataObj.java +++ b/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; } 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 b538a13..5f2cda4 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 @@ -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(); } 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 1227c0b..28f1dc7 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 @@ -87,7 +87,7 @@ public interface IMemberUserService extends IService { * @date 15:55 2025/3/26 **/ String gzhLogin(String wxOpenId, JSONObject userInfo); - void sendNewGift(); + void sendNewGift() throws Exception; /** * 判断是否领取过新人好礼 */ 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 80293d2..90f5efd 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 @@ -322,7 +322,11 @@ public class MemberUserServiceImpl extends ServiceImpl sendNewGift = baseConfigService.queryConfigByCode("send_new_gift"); if(CollectionUtil.isNotEmpty(sendNewGift)){ diff --git a/ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml b/ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml index 464d329..13ab601 100644 --- a/ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml +++ b/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,