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

Merge branch 'master' of http://122.51.230.86:3000/dianliang/dl_admin

Browse Source
This commit is contained in:
PQZ 2025-04-02 18:18:09 +08:00
commit a6261ae239
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,4 +212,23 @@ public class BusiNoticeController extends BaseController
IPage<BusiNoticeVo> list = busiNoticeService.appFootprintList(query,page);
return success(list);
}
/**
* 小程序端查询订阅通告列表
* @author zcy
* @date 15:39 2025/3/29
* @param query 查询条件
* @param pageNum 1
* @param pageSize 10
* @return com.ruoyi.common.core.domain.AjaxResult
**/
@GetMapping("/subscribeList")
public AjaxResult subscribeList(AppNoticeQuery query,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize)
{
Page<BusiNotice> page = new Page<>(pageNum, pageSize);
IPage<BusiNoticeVo> list = busiNoticeService.appFootprintList(query,page);
return success(list);
}
}

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

@ -320,8 +320,6 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
res.put("isSign",true);
}
}
return res;
}

17
ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiUserLoveServiceImpl.java
View File

@ -7,12 +7,15 @@ import com.ruoyi.common.utils.DateUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.member.domain.MemberUser;
import com.ruoyi.member.service.IMemberUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.busi.mapper.BusiUserLoveMapper;
import com.ruoyi.busi.domain.BusiUserLove;
import com.ruoyi.busi.service.IBusiUserLoveService;
import org.springframework.transaction.annotation.Transactional;
/**
* 用户关注Service业务层处理
@ -25,6 +28,8 @@ public class BusiUserLoveServiceImpl extends ServiceImpl<BusiUserLoveMapper,Busi
{
@Autowired
private BusiUserLoveMapper busiUserLoveMapper;
@Autowired
private IMemberUserService memberUserService;
@Override
public IPage<BusiUserLove> queryListPage(BusiUserLove pageReqVO, Page<BusiUserLove> page) {
@ -35,6 +40,7 @@ public class BusiUserLoveServiceImpl extends ServiceImpl<BusiUserLoveMapper,Busi
* @param userId 通告主id isLove 0取消关注 1 关注
*/
@Override
@Transactional
public void userLoveIs(Long userId, String isLove) {
Long nowUserId = SecurityUtils.getUserId();
if ("0".equals(isLove)){
@ -53,6 +59,15 @@ public class BusiUserLoveServiceImpl extends ServiceImpl<BusiUserLoveMapper,Busi
busiUserLove.setCreator(String.valueOf(nowUserId));
busiUserLoveMapper.insert(busiUserLove);
}
LambdaQueryWrapper<BusiUserLove> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BusiUserLove::getLoveUserId,userId);
Integer loveCount = baseMapper.selectCount(queryWrapper);
LambdaQueryWrapper<MemberUser> memberWrapper = new LambdaQueryWrapper<>();
memberWrapper.eq(MemberUser::getUserId,userId).eq(MemberUser::getUserType,"01");
MemberUser memberUser = memberUserService.getOne(memberWrapper);
if (memberUser!=null){
memberUser.setTFansNum(loveCount);
memberUserService.updateById(memberUser);
}
}
}

1
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java
View File

@ -66,7 +66,6 @@ public class MemberBusiCardServiceImpl extends ServiceImpl<MemberBusiCardMapper,
public List<MemberBusiCard> queryListByUserId(Long userId) {
LambdaQueryWrapper<MemberBusiCard> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0)
.eq(MemberBusiCard::getApprovalStatus,"1")
.eq(MemberBusiCard::getUserId,userId);
return list(lambdaQueryWrapper);
}