From df0ebb7334311a6e8a0d50071ff4d9652d52c8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 11 Nov 2024 21:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EOrder=E3=80=81OrderGoods?= =?UTF-8?q?=E3=80=81Cart=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gxwebsoft/common/system/entity/Order.java | 4 ++++ .../common/system/service/impl/OrderServiceImpl.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Order.java b/src/main/java/com/gxwebsoft/common/system/entity/Order.java index 7728e04..86282f1 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Order.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Order.java @@ -167,5 +167,9 @@ public class Order implements Serializable { @TableField(exist = false) private String logo; + @ApiModelProperty(value = "订单商品") + @TableField(exist = false) + private List orderGoods; + } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/OrderServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/OrderServiceImpl.java index ac7a412..60b66da 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/OrderServiceImpl.java @@ -1,6 +1,7 @@ package com.gxwebsoft.common.system.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.common.core.web.PageParam; @@ -40,6 +41,11 @@ public class OrderServiceImpl extends ServiceImpl implements PageParam page = new PageParam<>(param); page.setDefaultOrder("create_time desc"); List list = baseMapper.selectPageRel(page, param); + if (param.getSceneType() != null && ObjectUtil.isNotEmpty(param.getSceneType().equals("showOrderGoods"))) { + list.forEach(d -> { + d.setOrderGoods(orderGoodsService.list(new LambdaQueryWrapper().eq(OrderGoods::getOrderId, d.getOrderId()))); + }); + } return new PageResult<>(list, page.getTotal()); }