From a57aef3c54250c3c762056daf0de79ab58a911bd Mon Sep 17 00:00:00 2001 From: yc13649764453 <1902434166@qq.com> Date: Wed, 20 Sep 2023 16:22:50 +0800 Subject: [PATCH] =?UTF-8?q?--=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BookChapterController.java | 2 +- .../book/controller/BuyOrderController.java | 20 +++++++++---------- .../controller/ShopProductController.java | 17 ++++------------ .../service/impl/BuyOrderServiceImpl.java | 18 +++++++++++++---- .../service/impl/ShopProductServiceImpl.java | 1 + 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BookChapterController.java b/src/main/java/com/peanut/modules/book/controller/BookChapterController.java index ab0cf2be..9ee6f6c8 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookChapterController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookChapterController.java @@ -278,7 +278,7 @@ public class BookChapterController { for(Integer id : ids){ - + BookChapterEntity chapter = bookChapterService.getBaseMapper().selectOne(new QueryWrapper() .eq("id", id) ); 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 deac6019..c39e13b5 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -671,29 +671,26 @@ public class BuyOrderController { * 信息 */ @RequestMapping("/appGetOrderInfo/{type}") -// @RequiresPermissions("book:buyorder:info") 就是这个 - public R appGetOrderInfo(@PathVariable String type , @RequestParam("orderId") Integer orderId){ - - - - BuyOrderEntity buyOrder = buyOrderService.getById(orderId); - List orderDetail = null; - if("1".equals(type)){ orderDetail = buyOrderDetailService.getBaseMapper().selectList(new QueryWrapper() .eq("order_id", orderId)); }else{ orderDetail = buyOrderDetailService.getBaseMapper().selectList(new QueryWrapper() - .eq("order_id", orderId).groupBy("shipping_sn")); + .eq("order_id", orderId)); + //TODO 根据shipping_sn快递单号分组，订单下无快递单号，我的订单同时无法显示，暂时注释 + //.groupBy("shipping_sn") } for (BuyOrderDetailEntity buyOrderDetailEntity : orderDetail) { ShopProductEntity prod = shopProductService.getById(buyOrderDetailEntity.getProductId()); - buyOrderDetailEntity.setImage(prod.getProductImages()); + if (prod != null) { + buyOrderDetailEntity.setImage(prod.getProductImages()); + } + } @@ -729,6 +726,9 @@ public class BuyOrderController { buyOrder.setProducts(resultOrder); Date createDate = buyOrder.getCreateTime(); + + + return R.ok().put("buyOrder", buyOrder).put("CreateTime",createDate).put("userRecordid",id); } diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java index a09098d4..9e7a2c05 100644 --- a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java +++ b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java @@ -251,7 +251,10 @@ public class ShopProductController { */ @RequestMapping("/info/{productId}") public R info(@PathVariable("productId") Integer productId){ - ShopProductEntity shopProductEntity = shopProductService.getBaseMapper().selectOne(new QueryWrapper().eq("product_id", productId)); + ShopProductEntity shopProductEntity = shopProductService.getBaseMapper().selectOne(new QueryWrapper().eq("product_id", productId).eq("del_flag",0)); + if (shopProductEntity == null) { + return R.error("该商品已下架，看看其他商品吧"); + } ArrayList> imagesUrl = new ArrayList>(); Integer poid = shopProductEntity.getProductPid(); @@ -338,16 +341,11 @@ public class ShopProductController { /** * 修改 */ - - //Todo 9.19 提交 @RequestMapping("/update") public R update(@RequestBody ShopProductEntity shopProduct) { //商品id Integer productId = shopProduct.getProductId(); - - //多个图书id - ArrayList bookId = shopProduct.getBookids(); shopProduct.setCreateTime(new Date()); //用list集合接收数组，转String类型字符串 String bkids = ""; @@ -363,13 +361,6 @@ public class ShopProductController { //传过来的proudictid只有一个，但是bookid可能有多个，对应的一个proudictid一个bookid为一条数据，一对多存储 List bookyList = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper() .eq("proudict_id", productId)); - -// List list = new ArrayList<>(); -// for (ShopProudictBookEntity shopProudictBookEntity : bookyList) { -// Integer proudictBookbookId1 = shopProudictBookEntity.getBookId(); -// list.add(proudictBookbookId1); -// -// } Integer shop_book_ids [] = new Integer[bookyList.size()]; for(int i=0; i entities = buyOrderDetailService.getBaseMapper().selectList(new QueryWrapper() .eq("order_id", orderId)); - for (BuyOrderDetailEntity entity : entities) { - Integer productId = entity.getProductId(); - ShopProductEntity shopPro = shopProductService.getById(productId); - entity.setImage(shopPro.getProductImages()); + if (entities!=null) { + for (BuyOrderDetailEntity entity : entities) { + Integer productId = entity.getProductId(); + ShopProductEntity shopPro = shopProductService.getById(productId); + if (shopPro != null) { + String productImages = shopPro.getProductImages(); + + entity.setImage(productImages); + } + + + + } } + buyOrderEntity.setProducts(entities); } diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java index 5ad8e216..2663072b 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java @@ -36,6 +36,7 @@ public class ShopProductServiceImpl extends ServiceImpl page = this.page( new Query().getPage(params), new QueryWrapper().orderByDesc("create_time") + .like("product_name", params.get("key")) ); return new PageUtils(page); }