新增Order、OrderGoods、Cart表

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> orderGoods;
+
 
 }

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<OrderMapper, Order> implements
         PageParam<Order, OrderParam> page = new PageParam<>(param);
         page.setDefaultOrder("create_time desc");
         List<Order> list = baseMapper.selectPageRel(page, param);
+        if (param.getSceneType() != null && ObjectUtil.isNotEmpty(param.getSceneType().equals("showOrderGoods"))) {
+          list.forEach(d -> {
+            d.setOrderGoods(orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, d.getOrderId())));
+          });
+        }
         return new PageResult<>(list, page.getTotal());
     }