dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
13405411873 2025-05-06 14:05:51 +08:00
parent d7474209c0
commit 7f0bcc9c2a
7 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java
View File

@ -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));
}
/**

2
ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java
View File

@ -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 保存参数

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

@ -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;
}

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

@ -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());
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java
View File

@ -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){

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

@ -88,5 +88,9 @@ public interface IMemberUserService extends IService<MemberUser> {
**/
String gzhLogin(String wxOpenId, JSONObject userInfo);
void sendNewGift();
/**
* 判断是否领取过新人好礼
*/
Object isGetGift();
}

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

@ -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();
}
}