From bb9be1748b202707e89c0e18087387bc9eed003f Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 17 Oct 2023 15:45:28 +0800 Subject: [PATCH] bug xf --- .../controller/BookClockForumController.java | 16 ++++++------- .../book/controller/BookController.java | 4 +++- .../book/controller/BuyOrderController.java | 24 +++++++++++++++++++ .../book/dao/BookClockEntryChatDao.java | 4 ++-- ...ity.java => BookClockEntryChatEntity.java} | 2 +- .../modules/book/entity/BuyOrderEntity.java | 3 +++ .../service/BookClockEntryChatService.java | 4 ++-- .../service/impl/BookClockEntryChatImpl.java | 4 ++-- 8 files changed, 45 insertions(+), 16 deletions(-) rename src/main/java/com/peanut/modules/book/entity/{BookClockInChatEntity.java => BookClockEntryChatEntity.java} (93%) diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java b/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java index c01e6340..ae1cbdab 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.peanut.common.utils.R; import com.peanut.modules.app.service.UserService; import com.peanut.modules.book.entity.BookClockEntryEntity; -import com.peanut.modules.book.entity.BookClockInChatEntity; +import com.peanut.modules.book.entity.BookClockEntryChatEntity; import com.peanut.modules.book.entity.UserEntity; import com.peanut.modules.book.service.BookClockEntryChatService; import com.peanut.modules.book.service.BookClockEntryService; @@ -66,7 +66,7 @@ public class BookClockForumController { @RequestMapping(path = "/getChatList", method = RequestMethod.GET) public R getChatList(@RequestParam("entryId") Integer entryId, @RequestParam(value = "userId", required = false) Integer userId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("entry_id", entryId); queryWrapper.eq("fid", 0); if (userId != null) { @@ -74,8 +74,8 @@ public class BookClockForumController { } queryWrapper.orderByAsc("fid", "create_time"); List resultList = new ArrayList<>(); - List chatEntityList = bookClockEntryChatService.list(queryWrapper); - for (BookClockInChatEntity entity : chatEntityList) { + List chatEntityList = bookClockEntryChatService.list(queryWrapper); + for (BookClockEntryChatEntity entity : chatEntityList) { List imageList = JSON.parseObject(entity.getImages(), new TypeReference>() { }); entity.setImageList(imageList); @@ -84,11 +84,11 @@ public class BookClockForumController { UserEntity user = userService.getById(entity.getUserId()); vo.setNickName(user.getNickname()); vo.setAvatar(user.getAvatar()); - QueryWrapper subQueryWrapper = new QueryWrapper<>(); + QueryWrapper subQueryWrapper = new QueryWrapper<>(); subQueryWrapper.eq("fid", entity.getId()); - List subClockInChatList = bookClockEntryChatService.list(subQueryWrapper); + List subClockInChatList = bookClockEntryChatService.list(subQueryWrapper); List subCommentList = new ArrayList<>(); - for (BookClockInChatEntity subChat : subClockInChatList) { + for (BookClockEntryChatEntity subChat : subClockInChatList) { ClockInCommentVo subVo = new ClockInCommentVo(); BeanUtil.copyProperties(subChat, subVo); UserEntity subChatUser = userService.getById(subChat.getUserId()); @@ -114,7 +114,7 @@ public class BookClockForumController { * @return */ @RequestMapping(path = "/addChat", method = RequestMethod.POST) - public R addChat(@RequestBody BookClockInChatEntity chat) { + public R addChat(@RequestBody BookClockEntryChatEntity chat) { List imageList = chat.getImageList(); if (imageList != null) { String images = JSON.toJSON(imageList).toString(); diff --git a/src/main/java/com/peanut/modules/book/controller/BookController.java b/src/main/java/com/peanut/modules/book/controller/BookController.java index 7a57a9ed..114118de 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookController.java @@ -685,7 +685,9 @@ public class BookController { LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(BookEntity::getDelFlag,0); - wrapper1.in(BookEntity::getId,bookIds); + if(bookIds.size()>0){ + wrapper1.in(BookEntity::getId,bookIds); + } Page bookEntityPage = bookService.getBaseMapper().selectPage(new Page<>(page, limit), wrapper1); return R.ok().put("page",bookEntityPage); diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 12fe0620..96c55d1a 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -262,6 +262,30 @@ public class BuyOrderController { return R.ok().put("orderSn", timeId); } + /** + * 获取订单详情 + * @param orderId + * @return + */ + @RequestMapping("/getOrderDetail") + public R getOrderDetail(@RequestParam Integer orderId){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BuyOrderEntity::getOrderId,orderId); + BuyOrderEntity one = buyOrderService.getOne(wrapper); + if(one.equals(null)){ + return R.error("order error:order is null"); + } + //添加用户信息 + one.setUser(myUserService.getById(one.getUserId())); + //添加商品信息 + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(BuyOrderDetailEntity::getOrderId,orderId); + List buyOrderDetailEntities = buyOrderDetailService.getBaseMapper().selectList(wrapper1); + one.setProducts(buyOrderDetailEntities); + + return R.ok().put("user",one); + } + /** * 信息 diff --git a/src/main/java/com/peanut/modules/book/dao/BookClockEntryChatDao.java b/src/main/java/com/peanut/modules/book/dao/BookClockEntryChatDao.java index c9a7d83f..43c572b9 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookClockEntryChatDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookClockEntryChatDao.java @@ -1,9 +1,9 @@ package com.peanut.modules.book.dao; import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.book.entity.BookClockInChatEntity; +import com.peanut.modules.book.entity.BookClockEntryChatEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface BookClockEntryChatDao extends MPJBaseMapper { +public interface BookClockEntryChatDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java b/src/main/java/com/peanut/modules/book/entity/BookClockEntryChatEntity.java similarity index 93% rename from src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java rename to src/main/java/com/peanut/modules/book/entity/BookClockEntryChatEntity.java index 3c9d6e24..f000c4e7 100644 --- a/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/BookClockEntryChatEntity.java @@ -12,7 +12,7 @@ import java.util.List; @Data @TableName("book_clock_entry_chat") -public class BookClockInChatEntity implements Serializable { +public class BookClockEntryChatEntity implements Serializable { private static final long serialVersionUID = 1L; @TableId diff --git a/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java b/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java index 6bc2d4c6..36ca9377 100644 --- a/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java @@ -169,4 +169,7 @@ public class BuyOrderEntity implements Serializable { @TableField(exist = false) private Long timestamp; + + @TableField(exist = false) + private MyUserEntity user; } diff --git a/src/main/java/com/peanut/modules/book/service/BookClockEntryChatService.java b/src/main/java/com/peanut/modules/book/service/BookClockEntryChatService.java index d6eb3352..c91fa49e 100644 --- a/src/main/java/com/peanut/modules/book/service/BookClockEntryChatService.java +++ b/src/main/java/com/peanut/modules/book/service/BookClockEntryChatService.java @@ -1,7 +1,7 @@ package com.peanut.modules.book.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.book.entity.BookClockInChatEntity; +import com.peanut.modules.book.entity.BookClockEntryChatEntity; -public interface BookClockEntryChatService extends IService { +public interface BookClockEntryChatService extends IService { } diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookClockEntryChatImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookClockEntryChatImpl.java index 85c51fc6..8ffdac07 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BookClockEntryChatImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BookClockEntryChatImpl.java @@ -2,10 +2,10 @@ package com.peanut.modules.book.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.modules.book.dao.BookClockEntryChatDao; -import com.peanut.modules.book.entity.BookClockInChatEntity; +import com.peanut.modules.book.entity.BookClockEntryChatEntity; import com.peanut.modules.book.service.BookClockEntryChatService; import org.springframework.stereotype.Service; @Service("bookClockEntryChatService") -public class BookClockEntryChatImpl extends ServiceImpl implements BookClockEntryChatService { +public class BookClockEntryChatImpl extends ServiceImpl implements BookClockEntryChatService { }