修复了bug
This commit is contained in:
parent
81a7a0e5fd
commit
26d5b51f63
|
@ -45,7 +45,7 @@ public class TBookCollectionController {
|
||||||
private final RedisCache redisCache;
|
private final RedisCache redisCache;
|
||||||
|
|
||||||
@GetMapping("/mylist")
|
@GetMapping("/mylist")
|
||||||
public List<TBookCollectionEntity> getBookCollectionByUserId(HttpServletRequest request) {
|
public Result<List<TBookCollectionEntity>> getBookCollectionByUserId(HttpServletRequest request) {
|
||||||
String token = request.getHeader("token");
|
String token = request.getHeader("token");
|
||||||
TUserEntity entity = (TUserEntity) redisCache.get(token);
|
TUserEntity entity = (TUserEntity) redisCache.get(token);
|
||||||
if(ObjectUtils.isNull(entity)){
|
if(ObjectUtils.isNull(entity)){
|
||||||
|
@ -58,7 +58,7 @@ public class TBookCollectionController {
|
||||||
ZonedDateTime zdt = currentTime.atZone(zoneId);
|
ZonedDateTime zdt = currentTime.atZone(zoneId);
|
||||||
Date date = Date.from(zdt.toInstant());
|
Date date = Date.from(zdt.toInstant());
|
||||||
|
|
||||||
return bookCollectionDao.selectBookCollectionByUserId(Long.valueOf(userId));
|
return Result.ok(bookCollectionDao.selectBookCollectionByUserId(Long.valueOf(userId)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("page")
|
@GetMapping("page")
|
||||||
|
|
|
@ -116,7 +116,7 @@ public class TBookCommentController {
|
||||||
}
|
}
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
@Operation(summary = "查看评论列表")
|
@Operation(summary = "查看评论列表")
|
||||||
public List<TBookCommentEntity> list(HttpServletRequest request){
|
public Result<List<TBookCommentEntity>> list(HttpServletRequest request){
|
||||||
String token = request.getHeader("token");
|
String token = request.getHeader("token");
|
||||||
TUserEntity entity = (TUserEntity) redisCache.get(token);
|
TUserEntity entity = (TUserEntity) redisCache.get(token);
|
||||||
if(ObjectUtils.isNull(entity)){
|
if(ObjectUtils.isNull(entity)){
|
||||||
|
@ -124,7 +124,7 @@ public class TBookCommentController {
|
||||||
}
|
}
|
||||||
TUserEntity tUserEntity = (TUserEntity) redisCache.get(token);
|
TUserEntity tUserEntity = (TUserEntity) redisCache.get(token);
|
||||||
Integer userId=tUserEntity.getId();
|
Integer userId=tUserEntity.getId();
|
||||||
return tBookCommentDao.findAll(Long.valueOf(userId));
|
return Result.ok(tBookCommentDao.findAll(Long.valueOf(userId)));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -52,7 +52,7 @@ public class TPurchaseDetailsController {
|
||||||
private final RedisCache redisCache;
|
private final RedisCache redisCache;
|
||||||
private final TPurchaseDetailsDao tPurchaseDetailsDao;
|
private final TPurchaseDetailsDao tPurchaseDetailsDao;
|
||||||
@GetMapping("/a")
|
@GetMapping("/a")
|
||||||
public List<TPurchaseBookVo> getBookCollectionByUserId(HttpServletRequest request) {
|
public Result<List<TPurchaseBookVo>> getBookCollectionByUserId(HttpServletRequest request) {
|
||||||
String token = request.getHeader("token");
|
String token = request.getHeader("token");
|
||||||
TUserEntity entity = (TUserEntity) redisCache.get(token);
|
TUserEntity entity = (TUserEntity) redisCache.get(token);
|
||||||
if(ObjectUtils.isNull(entity)){
|
if(ObjectUtils.isNull(entity)){
|
||||||
|
@ -70,7 +70,7 @@ public class TPurchaseDetailsController {
|
||||||
ZonedDateTime zdt = currentTime.atZone(zoneId);
|
ZonedDateTime zdt = currentTime.atZone(zoneId);
|
||||||
Date date = Date.from(zdt.toInstant());
|
Date date = Date.from(zdt.toInstant());
|
||||||
|
|
||||||
return tPurchaseDetailsService.selectByUserId(userId);
|
return Result.ok(tPurchaseDetailsService.selectByUserId(userId));
|
||||||
}
|
}
|
||||||
@PostMapping("/buy")
|
@PostMapping("/buy")
|
||||||
@Operation(summary = "购买")
|
@Operation(summary = "购买")
|
||||||
|
|
|
@ -112,7 +112,7 @@ public class TShoppingTrolleyController {
|
||||||
return Result.ok(list);
|
return Result.ok(list);
|
||||||
}
|
}
|
||||||
@GetMapping("/newmyshop")
|
@GetMapping("/newmyshop")
|
||||||
public List<TShoppingTrolleyEntity> getBookCollectionByUserId(HttpServletRequest request) {
|
public Result<List<TShoppingTrolleyEntity>> getBookCollectionByUserId(HttpServletRequest request) {
|
||||||
String token = request.getHeader("token");
|
String token = request.getHeader("token");
|
||||||
TUserEntity entity = (TUserEntity) redisCache.get(token);
|
TUserEntity entity = (TUserEntity) redisCache.get(token);
|
||||||
if(ObjectUtils.isNull(entity)){
|
if(ObjectUtils.isNull(entity)){
|
||||||
|
@ -130,7 +130,7 @@ public class TShoppingTrolleyController {
|
||||||
ZonedDateTime zdt = currentTime.atZone(zoneId);
|
ZonedDateTime zdt = currentTime.atZone(zoneId);
|
||||||
Date date = Date.from(zdt.toInstant());
|
Date date = Date.from(zdt.toInstant());
|
||||||
|
|
||||||
return tShoppingTrolleyDao.selectShoppingTrolleyByUserId(Long.valueOf(userId));
|
return Result.ok(tShoppingTrolleyDao.selectShoppingTrolleyByUserId(Long.valueOf(userId)));
|
||||||
}
|
}
|
||||||
@DeleteMapping("/clean")
|
@DeleteMapping("/clean")
|
||||||
@Operation(summary = "清空购物车")
|
@Operation(summary = "清空购物车")
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
tb.book_name,
|
tb.book_name,
|
||||||
tb.price,
|
tb.price,
|
||||||
tb.book_cover,
|
tb.book_cover,
|
||||||
tb.introduction
|
tb.introduction,
|
||||||
|
st.number
|
||||||
FROM t_shopping_trolley st
|
FROM t_shopping_trolley st
|
||||||
LEFT JOIN t_book tb ON st.book_id=tb.id,
|
LEFT JOIN t_book tb ON st.book_id=tb.id,
|
||||||
(SELECT @row_number := 0) AS dummy
|
(SELECT @row_number := 0) AS dummy
|
||||||
|
|
Loading…
Reference in New Issue
Block a user