fix 订单商品

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import com.zhongzheng.modules.order.bo.OrderAddBo;
 import com.zhongzheng.modules.order.bo.OrderEditBo;
 import com.zhongzheng.modules.order.bo.OrderQueryBo;
+import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderVo;
 import lombok.RequiredArgsConstructor;
@@ -55,6 +56,18 @@ public class OrderController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询订单列表
+     */
+    @ApiOperation("查询订单和商品列表")
+    @PreAuthorize("@ss.hasPermi('system:order:list')")
+    @GetMapping("/listAll")
+    public TableDataInfo<Order> listAll(OrderQueryBo bo) {
+        startPage();
+        List<Order> list = iOrderService.getOrderGoodsList(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 导出订单列表
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Order.java

@@ -70,6 +70,7 @@ private static final long serialVersionUID=1L;
     /** 订单完成时间 */
     private Long finishTime;
 
-
-
+    /** 商品列表 */
+    @TableField(exist = false)
+    private List<OrderGoods> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderMapper.java

@@ -2,7 +2,11 @@ package com.zhongzheng.modules.order.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.domain.Order;
+import com.zhongzheng.modules.order.vo.OrderVo;
+
+import java.util.List;
 
 /**
  * 订单Mapper接口
@@ -11,5 +15,5 @@ import com.zhongzheng.modules.order.domain.Order;
  * @date 2021-05-19
  */
 public interface OrderMapper extends BaseMapper<Order> {
-
+    List<Order> getOrderGoodsList(OrderQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderService.java

@@ -32,6 +32,8 @@ public interface IOrderService extends IService<Order> {
 	 */
 	List<OrderVo> queryList(OrderQueryBo bo);
 
+	List<Order> getOrderGoodsList(OrderQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入订单
 	 * @param bo 订单新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -89,6 +89,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IOrderActivityService oOrderActivityService;
 
+    @Autowired
+    private OrderMapper orderMapper;
+
     @Override
     public OrderVo queryById(Long orderId){
         Order db = this.baseMapper.selectById(orderId);
@@ -119,6 +122,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<Order> getOrderGoodsList(OrderQueryBo bo) {
+        return orderMapper.getOrderGoodsList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zhongzheng.modules.order.domain.OrderGoods" id="OrderGoodsResult">
         <result property="id" column="id"/>
         <result property="orderSn" column="order_sn"/>
-        <result property="goddsType" column="godds_type"/>
+        <result property="goodsType" column="goods_type"/>
         <result property="goodsId" column="goods_id"/>
         <result property="goodsPrice" column="goods_price"/>
         <result property="num" column="num"/>

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -18,7 +18,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="transid" column="transid"/>
         <result property="cancelTime" column="cancel_time"/>
         <result property="finishTime" column="finish_time"/>
+        <collection property="goodsList" ofType="com.zhongzheng.modules.order.domain.OrderGoods" column="orderSn">
+            <result property="goodsType" column="goods_type"/>
+            <result property="goodsId" column="goods_id"/>
+            <result property="goodsPrice" column="goods_price"/>
+            <result property="num" column="num"/>
+        </collection>
     </resultMap>
 
-
+    <select id="getOrderGoodsList" resultMap="OrderResult">
+        SELECT
+            o.*,
+            og.goods_id,
+            og.goods_type,
+            og.goods_price,
+            og.num
+        FROM
+            `order` o
+                LEFT JOIN order_goods og ON o.oder_sn = og.order_sn
+        ORDER BY
+            order_id DESC
+    </select>
 </mapper>