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 * 保存 * @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 { **/ 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