diff --git a/admin-pc/.env.production b/admin-pc/.env.production index cba03f8..1221ea1 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8002/novel-admin/ +VUE_APP_API_BASE_URL=https://prod-api.budingxiaoshuo.com/novel-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java index 3beab16..8b25eed 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletAchievementServiceImpl.java @@ -52,6 +52,7 @@ public class AppletAchievementServiceImpl implements AppletAchievementService { public Result setAchievementName(String token, CommonBookAchievementLog bookAchievementLog){ HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); bookAchievementLog.setUserId(member.getId()); + bookAchievementLog.setStatus("0"); commonBookAchievementLogService.saveOrUpdate(bookAchievementLog); return Result.OK(); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java index 7f95bea..e78dc9c 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletBookServiceImpl.java @@ -24,6 +24,7 @@ import org.jeecg.modules.commonMyBook.service.ICommonMyBookService; import org.jeecg.modules.commonMyGift.service.ICommonMyGiftService; import org.jeecg.modules.commonNotice.service.ICommonNoticeService; import org.jeecg.modules.commonRanking.service.ICommonRankingService; +import org.jeecg.modules.commonShop.entity.CommonShop; import org.jeecg.modules.commonShop.service.ICommonShopService; import org.jeecg.modules.commonShopClass.service.ICommonShopClassService; import org.jeecg.modules.commonSign.service.ICommonSignService; @@ -37,6 +38,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; @Service public class AppletBookServiceImpl implements AppletBookService { @@ -87,16 +90,38 @@ public class AppletBookServiceImpl implements AppletBookService { @Override public Result getReadBookPage(String token, PageBean pageBean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查询下架的书籍 + List collect = commonShopService.lambdaQuery() + .eq(CommonShop::getBookStatus, 1) + .select(CommonShop::getId) + .list().stream().map(n -> n.getId()) + .collect(Collectors.toList()); + //查询阅读过的书籍列表带分页 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); IPage pageList = commonBookService .lambdaQuery() + .notIn(collect.size() > 0, CommonBook::getShopId, collect) .eq(CommonBook::getUserId,hanHaiMember.getId()) .page(page); + + pageList.getRecords().forEach(this::addAuthor); + return Result.OK("我阅读过的书籍列表",pageList); } - + private void addAuthor(CommonBook book){ + HanHaiMember member = hanHaiMemberService.lambdaQuery() + .select(HanHaiMember::getName) + .eq(HanHaiMember::getId, book.getUserId()) + .one(); + if(member != null){ + book.setAuthor(member.getName()); + }else { + book.setAuthor("无作者"); + } + } //修改我的书架信息 @Override diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletMyBookServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletMyBookServiceImpl.java index 0fd8f5d..8e5b747 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletMyBookServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletMyBookServiceImpl.java @@ -61,9 +61,9 @@ public class AppletMyBookServiceImpl implements AppletMyBookService { return Result.error("您不是作者,无法添加作品,请完善笔名简介"); } commonShop.setUserId(member.getId()); + commonShop.setToolStatus(0);//设置状态 if(StringUtils.isEmpty(commonShop.getId())){ - commonShop.setToolStatus(0); - commonShop.setStatus(0);//审核状态 + commonShop.setStatus(0);//完结状态 commonShop.setBookStatus(0); commonShop.setQmNum(0); commonShop.setTuiNum(0); @@ -99,6 +99,7 @@ public class AppletMyBookServiceImpl implements AppletMyBookService { CommonBookNovel::getCreateBy, CommonBookNovel::getUserId, CommonBookNovel::getIsPay, + CommonBookNovel::getState, CommonBookNovel::getNum ) .eq(CommonBookNovel::getBookId,bookId) diff --git a/module-common/src/main/java/org/jeecg/modules/commonBook/entity/CommonBook.java b/module-common/src/main/java/org/jeecg/modules/commonBook/entity/CommonBook.java index 1811d9e..7a1baa1 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBook/entity/CommonBook.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBook/entity/CommonBook.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -77,4 +78,7 @@ public class CommonBook implements Serializable { @Excel(name = "章节字数", width = 15) @ApiModelProperty(value = "章节字数") private java.lang.Integer novelNum; + + @TableField(exist = false) + private String author; }