Skip to content

M
mzyy
提交 1efd8e40 authored 作者: yucaiwei's avatar yucaiwei
浏览文件
操作

--no commit message

上级 96658915
隐藏空白字符变更
内嵌 并排
正在显示 包含 21 行增加 和 21 行删除
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMapper.java
浏览文件 @ 1efd8e40
......@@ -29,7 +29,7 @@ public interface EbookMapper extends BaseMapper<Ebook>{
@Select("<script>"
+ "SELECT "
+ " DISTINCT bb.id,bb.name,bb.author,bb.isbn,"
+ " be.price,be.uploadTime,be.updateTime,be.bookstatus "
+ " be.price,be.uploadTime,be.updateTime,be.bookStatus "
+ " FROM res_book bb "
+ " LEFT JOIN res_ebook be ON bb.id = be.id "
+ " LEFT JOIN res_ebook_diy_type bdt ON be.id = bdt.ebookid"
......@@ -93,11 +93,11 @@ public interface EbookMapper extends BaseMapper<Ebook>{
@Select("<script>"
+ "SELECT "
+ " DISTINCT bb.id,bb.name,bb.author,bb.isbn,"
+ " be.bookCover,be.price,DATE_FORMAT(be.uploadTime,'%Y-%m-%d') uploadTime,DATE_FORMAT(be.updateTime,'%Y-%m-%d') updateTime,be.bookstatus "
+ " be.bookCover,be.price,DATE_FORMAT(be.uploadTime,'%Y-%m-%d') uploadTime,DATE_FORMAT(be.updateTime,'%Y-%m-%d') updateTime,be.bookStatus "
+ " FROM res_book bb "
+ " LEFT JOIN res_ebook be ON bb.id = be.id "
+ " LEFT JOIN res_ebook_diy_type bdt ON be.id = bdt.ebookid"
+ " WHERE 1 = 1 and be.bookstatus = 4 "
+ " WHERE 1 = 1 and be.bookStatus = 4 "
+ "<if test='"+ NOTBLANK +"(form.diyTypeCode)' >"
+ "and bdt.diyTypeCode like concat(#{form.diyTypeCode},'%') "
+ "</if>"
......
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/manage/resourcelibrary/FgResourceManageImpl.java
浏览文件 @ 1efd8e40
......@@ -64,8 +64,8 @@ public class FgResourceManageImpl implements FgResourceManage{
infoVo.setPrice(entity.getPrice());
infoVo.setSalePrice(entity.getRealPrice());
infoVo.setCover(entity.getImg());
infoVo.setBookstatus(entity.getStatus());
infoVo.setBookstatusZh(LibraryStatusEnum.getName(entity.getStatus()));
infoVo.setBookStatus(entity.getStatus());
infoVo.setBookStatusZh(LibraryStatusEnum.getName(entity.getStatus()));
//获取定价和售价，折扣
FgPromotionInfoOneVO pi = fgPromotionManage.getInfoByResId(id,entity.getResourceType());
if(pi != null){
......@@ -79,8 +79,8 @@ public class FgResourceManageImpl implements FgResourceManage{
infoVo.setName(entity.getName());
infoVo.setPrice(entity.getPrice());
infoVo.setSalePrice(entity.getPrice());
infoVo.setBookstatus(entity.getStatus());
infoVo.setBookstatusZh(LibraryStatusEnum.getName(entity.getStatus()));
infoVo.setBookStatus(entity.getStatus());
infoVo.setBookStatusZh(LibraryStatusEnum.getName(entity.getStatus()));
}
//课件
if(GoodsTypeEnum.COURSEWARE.getCode().equals(goodsType)){
......@@ -88,8 +88,8 @@ public class FgResourceManageImpl implements FgResourceManage{
infoVo.setName(entity.getName());
infoVo.setPrice(entity.getPrice());
infoVo.setSalePrice(entity.getPrice());
infoVo.setBookstatus(entity.getStatus());
infoVo.setBookstatusZh(LibraryStatusEnum.getName(entity.getStatus()));
infoVo.setBookStatus(entity.getStatus());
infoVo.setBookStatusZh(LibraryStatusEnum.getName(entity.getStatus()));
}
//电子书
if(GoodsTypeEnum.EBOOK.getCode().equals(goodsType)){
......@@ -99,8 +99,8 @@ public class FgResourceManageImpl implements FgResourceManage{
infoVo.setPrice(ebook.getPricing());
infoVo.setSalePrice(ebook.getPrice());
infoVo.setCover(ebook.getBookCover());
infoVo.setBookstatus(ebook.getBookStatus());
infoVo.setBookstatusZh(EbookStatusEnum.getName(ebook.getBookStatus()));
infoVo.setBookStatus(ebook.getBookStatus());
infoVo.setBookStatusZh(EbookStatusEnum.getName(ebook.getBookStatus()));
//获取定价和售价，折扣
FgPromotionInfoOneVO pi = fgPromotionManage.getInfoByResId(id,AllResourceTypeEnum.YIZHU.getCode());
if(pi != null){
......@@ -115,8 +115,8 @@ public class FgResourceManageImpl implements FgResourceManage{
infoVo.setPrice(entity.getPrice());
infoVo.setSalePrice(entity.getPrice());
infoVo.setCover(entity.getImage());
infoVo.setBookstatus(entity.getStatus());
infoVo.setBookstatusZh(LibraryStatusEnum.getName(entity.getStatus()));
infoVo.setBookStatus(entity.getStatus());
infoVo.setBookStatusZh(LibraryStatusEnum.getName(entity.getStatus()));
}
//视频
if(GoodsTypeEnum.VIDEO.getCode().equals(goodsType)){
......@@ -124,8 +124,8 @@ public class FgResourceManageImpl implements FgResourceManage{
infoVo.setName(entity.getName());
infoVo.setPrice(entity.getPrice());
infoVo.setSalePrice(entity.getPrice());
infoVo.setBookstatus(entity.getStatus());
infoVo.setBookstatusZh(LibraryStatusEnum.getName(entity.getStatus()));
infoVo.setBookStatus(entity.getStatus());
infoVo.setBookStatusZh(LibraryStatusEnum.getName(entity.getStatus()));
}
return infoVo;
}
......
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java
浏览文件 @ 1efd8e40
......@@ -30,7 +30,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
*/
@Select("<script>"
+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+ "bb.publishTime, bb.status, bb.nationsType, be.priceOption, be.price, be.bookCover, be.summary, be.bookstatus, be.browseNum "
+ "bb.publishTime, bb.status, bb.nationsType, be.priceOption, be.price, be.bookCover, be.summary, be.bookStatus, be.browseNum "
+ "FROM res_book bb "
+ "LEFT JOIN res_ebook be ON bb.id = be.id "
+ "where be.bookStatus = 4 "
......@@ -52,7 +52,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
*/
@Select("<script>"
+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+ "bb.publishTime, bb.status, bb.nationsType, be.priceOption, be.price, be.bookCover, be.summary, be.bookstatus, be.browseNum "
+ "bb.publishTime, bb.status, bb.nationsType, be.priceOption, be.price, be.bookCover, be.summary, be.bookStatus, be.browseNum "
+ "FROM res_book bb "
+ "LEFT JOIN res_ebook be ON bb.id = be.id "
+ "where be.bookStatus = 4 "
......@@ -74,7 +74,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
*/
@Select("<script>"
+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+ "bb.publishTime, bb.status, bb.nationsType, be.pricing, be.priceOption, be.price, be.bookCover, be.summary, be.bookstatus, be.browseNum, be.goodsType "
+ "bb.publishTime, bb.status, bb.nationsType, be.pricing, be.priceOption, be.price, be.bookCover, be.summary, be.bookStatus, be.browseNum, be.goodsType "
+ "FROM res_book bb "
+ "LEFT JOIN res_ebook be ON bb.id = be.id "
+ "LEFT JOIN res_ebook_diy_type bdt ON be.id = bdt.ebookId "
......@@ -110,7 +110,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
*/
@Select("<script>"
+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+ "bb.publishTime, bb.status, bb.nationsType, be.pricing, be.priceOption, be.price, be.bookCover, be.summary, be.bookstatus, be.browseNum, be.goodsType "
+ "bb.publishTime, bb.status, bb.nationsType, be.pricing, be.priceOption, be.price, be.bookCover, be.summary, be.bookStatus, be.browseNum, be.goodsType "
+ "FROM res_book bb "
+ "LEFT JOIN res_ebook be ON bb.id = be.id "
+ "WHERE be.bookStatus = 4 "
......@@ -125,7 +125,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
@Select("<script>"
+ "select DISTINCT bb.id, bb.name, "
+ "bb.publishTime, bb.status, bb.nationsType, be.priceOption, be.price, be.bookCover, be.bookstatus, be.browseNum "
+ "bb.publishTime, bb.status, bb.nationsType, be.priceOption, be.price, be.bookCover, be.bookStatus, be.browseNum "
+ "FROM res_book bb "
+ "LEFT JOIN res_ebook be ON bb.id = be.id "
+ "where be.bookStatus = 4 "
......
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/shoppingcart/FgShoppingCartServiceImpl.java
浏览文件 @ 1efd8e40
......@@ -121,7 +121,7 @@ public class FgShoppingCartServiceImpl extends BaseServiceImpl<ShoppingCart, Int
shoppingCarts.stream().forEach(shoppingCart -> {
ShoppingCartGoodsInfoVo shoppingCartGoodsInfoVo = fgResourceManage.queryInfo(shoppingCart.getGoodsId(), shoppingCart.getGoodsType());
ShoppingCartInfoVo ShoppingCartInfoVo = new ShoppingCartInfoVo();
if(shoppingCartGoodsInfoVo.getBookstatusZh() != "已上架"){
if(shoppingCartGoodsInfoVo.getBookStatusZh() != "已上架"){
dropCarts.add(shoppingCart.getId());
}
try {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论