zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-06-13 13:21:53 +08:00
parent b6bf65ec76 e3941c0b22
commit c7872cb965
9 changed files with 132 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java
View File

@@ -3,6 +3,7 @@ package com.peanut.modules.common.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.peanut.common.utils.R;
import com.peanut.modules.common.entity.CourseGuestbook;
import com.peanut.modules.common.entity.CourseGuestbookSupport;
import com.peanut.modules.common.service.CourseGuestbookService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,4 +33,16 @@ public class CourseGuestbookController {
return R.ok();
}
@RequestMapping("/addCourseGuestbookSupport")
public R addCourseGuestbookSupport(@RequestBody Map<String,Object> map){
service.addCourseGuestbookSupport(map);
return R.ok();
}
@RequestMapping("/cancelCourseGuestbookSupport")
public R cancelCourseGuestbookSupport(@RequestBody Map<String,Object> map){
service.cancelCourseGuestbookSupport(map);
return R.ok();
}
}

9
src/main/java/com/peanut/modules/common/dao/CourseGuestbookSupportDao.java Normal file
View File

@@ -0,0 +1,9 @@
package com.peanut.modules.common.dao;
import com.github.yulichang.base.MPJBaseMapper;
import com.peanut.modules.common.entity.CourseGuestbookSupport;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CourseGuestbookSupportDao extends MPJBaseMapper<CourseGuestbookSupport> {
}

6
src/main/java/com/peanut/modules/common/entity/CourseGuestbook.java
View File

@@ -32,8 +32,6 @@ public class CourseGuestbook {
private String images;
private Integer support;
private Integer state;
private Date createTime;
@@ -41,6 +39,10 @@ public class CourseGuestbook {
@TableLogic
private Integer delFlag;
@TableField(exist = false)
private boolean support;
@TableField(exist = false)
private int supportCount;
@TableField(exist = false)
private List<CourseGuestbook> children;
@TableField(exist = false)

21
src/main/java/com/peanut/modules/common/entity/CourseGuestbookSupport.java Normal file
View File

@@ -0,0 +1,21 @@
package com.peanut.modules.common.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName("course_guestbook_support")
public class CourseGuestbookSupport {
@TableId
private Integer id;
private Integer userId;
private Integer guestbookId;
@TableLogic
private Integer delFlag;
}

6
src/main/java/com/peanut/modules/common/service/CourseGuestbookService.java
View File

@@ -3,10 +3,16 @@ package com.peanut.modules.common.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.peanut.modules.common.entity.CourseGuestbook;
import com.peanut.modules.common.entity.CourseGuestbookSupport;
import java.util.Map;
public interface CourseGuestbookService extends IService<CourseGuestbook> {
Page getCourseGuestbookList(Map<String ,Object> map);
void addCourseGuestbookSupport(Map<String,Object> map);
void cancelCourseGuestbookSupport(Map<String,Object> map);
}

3
src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java
View File

@@ -139,6 +139,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
if (buyOrder.getProductId()!=null){
buyOrder.setBookBuyConfigEntity(bookBuyConfigDao.selectById(buyOrder.getProductId()));
}
if (buyOrder.getVipBuyConfigId()!=null){
buyOrder.setVipBuyConfigEntity(vipBuyConfigDao.selectById(buyOrder.getVipBuyConfigId()));
}
//添加商品信息
MPJLambdaWrapper<BuyOrderProduct> buyOrderProductWrapper = new MPJLambdaWrapper<>();
buyOrderProductWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId);

48
src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java
View File

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.common.dao.CourseGuestbookDao;
import com.peanut.modules.common.dao.CourseGuestbookSupportDao;
import com.peanut.modules.common.dao.MyUserDao;
import com.peanut.modules.common.entity.CourseGuestbook;
import com.peanut.modules.common.entity.CourseGuestbookSupport;
import com.peanut.modules.common.entity.MyUserEntity;
import com.peanut.modules.common.service.CourseGuestbookService;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +26,8 @@ public class CourseGuestbookServiceImpl extends ServiceImpl<CourseGuestbookDao,
@Autowired
private MyUserDao userDao;
@Autowired
private CourseGuestbookSupportDao supportDao;
@Override
public Page getCourseGuestbookList(Map<String, Object> map) {
@@ -48,12 +53,55 @@ public class CourseGuestbookServiceImpl extends ServiceImpl<CourseGuestbookDao,
if (list.size() > 0) {
for (CourseGuestbook c : list){
c.setUser(userDao.selectById(courseGuestbook.getUserId()));
//添加点赞数和是否点赞
c.setSupportCount(getUserSupportCount(c.getId()));
c.setSupport(getUserSupport(c.getId(), Integer.parseInt(map.get("userId").toString())));
}
}
courseGuestbook.setChildren(list);
//添加点赞数和是否点赞
courseGuestbook.setSupportCount(getUserSupportCount(courseGuestbook.getId()));
courseGuestbook.setSupport(getUserSupport(courseGuestbook.getId(), Integer.parseInt(map.get("userId").toString())));
}
}
return courseGuestbookPage;
}
@Override
public void addCourseGuestbookSupport(Map<String,Object> map) {
LambdaQueryWrapper<CourseGuestbookSupport> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CourseGuestbookSupport::getUserId,map.get("userId"));
wrapper.eq(CourseGuestbookSupport::getGuestbookId,map.get("guestbookId"));
CourseGuestbookSupport support = supportDao.selectOne(wrapper);
if (support == null) {
supportDao.insert(support);
}
}
@Override
public void cancelCourseGuestbookSupport(Map<String,Object> map) {
LambdaQueryWrapper<CourseGuestbookSupport> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CourseGuestbookSupport::getUserId,map.get("userId"));
wrapper.eq(CourseGuestbookSupport::getGuestbookId,map.get("guestbookId"));
supportDao.delete(wrapper);
}
public int getUserSupportCount(int guestbookId) {
LambdaQueryWrapper<CourseGuestbookSupport> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CourseGuestbookSupport::getGuestbookId,guestbookId);
return supportDao.selectCount(wrapper);
}
public boolean getUserSupport(int guestbookId,int userId) {
LambdaQueryWrapper<CourseGuestbookSupport> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CourseGuestbookSupport::getGuestbookId,guestbookId);
wrapper.eq(CourseGuestbookSupport::getUserId,userId);
int c = supportDao.selectCount(wrapper);
if (c>0){
return true;
}else {
return false;
}
}
}