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 903dae58..ca6f714f 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -312,6 +312,26 @@ public class BuyOrderController { return R.ok(result); } + @RequestMapping("/llll") + public R ls(){ + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + ArrayList integers = new ArrayList<>(); + integers.add(1); + integers.add(2); + integers.add(3); + wrapper.in(BuyOrder::getOrderStatus,integers); + wrapper.eq(BuyOrder::getOrderType,"order"); + List list = buyOrderService.list(wrapper); + for (BuyOrder b : list){ + List orderBookId = shopProductBookService.getOrderBookId(b.getOrderSn()); + System.out.println(orderBookId); + userEbookBuyService.addBookForUser(b.getUserId(),orderBookId); + } + + return R.ok(); + } + /** * 计算运费 * diff --git a/src/main/java/com/peanut/modules/book/controller/PointController.java b/src/main/java/com/peanut/modules/book/controller/PointController.java index 2bd826f3..f6bbb70c 100644 --- a/src/main/java/com/peanut/modules/book/controller/PointController.java +++ b/src/main/java/com/peanut/modules/book/controller/PointController.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.modules.book.entity.PointCategoryEntity; @@ -80,6 +81,8 @@ public class PointController { */ @RequestMapping("/addPoint") public R addPoint(@RequestBody PointEntity pointEntity){ + String jsonString = JSON.toJSONString(pointEntity.getImageList()); + pointEntity.setImages(jsonString); pointService.save(pointEntity); return R.ok(); } @@ -103,6 +106,8 @@ public class PointController { */ @RequestMapping("/editPoint") public R editPoint(@RequestBody PointEntity pointEntity){ + String jsonString = JSON.toJSONString(pointEntity.getImageList()); + pointEntity.setImages(jsonString); pointService.updateById(pointEntity); return R.ok(); } diff --git a/src/main/java/com/peanut/modules/book/entity/PointEntity.java b/src/main/java/com/peanut/modules/book/entity/PointEntity.java index 853779d3..3ec186e9 100644 --- a/src/main/java/com/peanut/modules/book/entity/PointEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/PointEntity.java @@ -1,13 +1,11 @@ package com.peanut.modules.book.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; @Data @TableName("point") @@ -18,11 +16,16 @@ public class PointEntity implements Serializable { private String title; + private String images; + + @TableField(exist = false) + private List imageList; + private Integer pointCategoryId; private String alias; - private String merdians; + private String meridian; private String position; diff --git a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java index 6ef739a6..e46e8ee7 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -36,6 +37,9 @@ public class PointServiceImpl extends ServiceImpl impleme } wrapper.orderByDesc(PointEntity::getSort); Page pointEntityPage = getBaseMapper().selectPage(new Page<>(page, limit), wrapper); + for (PointEntity p : pointEntityPage.getRecords()){ + p.setImageList(JSON.parseArray(p.getImages(),String.class)); + } return pointEntityPage; } diff --git a/src/main/resources/mapper/book/ShopProductBookDao.xml b/src/main/resources/mapper/book/ShopProductBookDao.xml index b3ff6d29..f4be270c 100644 --- a/src/main/resources/mapper/book/ShopProductBookDao.xml +++ b/src/main/resources/mapper/book/ShopProductBookDao.xml @@ -16,7 +16,7 @@