编号：ZSSAC-163 描述：修改查询订单列表接口

sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java

@@ -3,12 +3,14 @@ package com.sf.order.controller;
 import com.sf.common.annotation.Log;
 import com.sf.common.core.controller.BaseController;
 import com.sf.common.core.domain.AjaxResult;
+import com.sf.common.core.domain.entity.SysUser;
 import com.sf.common.core.page.TableDataInfo;
 import com.sf.common.enums.BusinessType;
+import com.sf.common.utils.SecurityUtils;
 import com.sf.common.utils.poi.ExcelUtil;
 import com.sf.order.domain.OrderInfo;
 import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
 import com.sf.order.domain.res.OrderListResVo;
 import com.sf.order.service.IOrderInfoService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -35,21 +37,15 @@ public class OrderInfoController extends BaseController {
      * 查询订单基础信息列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(OrderInfo orderInfo) {
+    public TableDataInfo list(OrderListReqVo vo) {
         startPage();
-        List<OrderInfo> list = orderInfoService.selectOrderInfoList(orderInfo);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        vo.setUserId(user.getUserId());
+        List<OrderListResVo> list = orderInfoService.queryList(vo);
+        logger.info("prderList"+list);
         return getDataTable(list);
     }
 
-    /**
-     * 查询订单基础信息列表
-     */
-    @GetMapping("/query/list")
-    public TableDataInfo queryList(OrderListreqVo vo) {
-        startPage();
-        List<OrderListResVo> list = orderInfoService.queryList(vo);
-        return getDataTable(list);
-    }
 
     /**
      * 导出订单基础信息列表

sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java

@@ -3,7 +3,7 @@ package com.sf.order.domain.req;
 import lombok.Data;
 
 @Data
-public class OrderListreqVo {
+public class OrderListReqVo {
     /**
      * 主键id
      */

sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java

@@ -38,6 +38,10 @@ public class OrderListResVo {
      * 商品标题
      */
     private String productTitle;
+    /**
+     * 图片
+     */
+    private String productPicture;
 
     /**
      * 商品规格

sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java

@@ -1,7 +1,7 @@
 package com.sf.order.mapper;
 
 import com.sf.order.domain.OrderInfo;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
 import com.sf.order.domain.res.OrderListResVo;
 
 import java.util.List;
@@ -31,7 +31,7 @@ public interface OrderInfoMapper {
     public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
 
 
-    List<OrderListResVo> queryList(OrderListreqVo vo);
+    List<OrderListResVo> queryList(OrderListReqVo vo);
 
     /**
      * 新增订单基础信息

sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java

@@ -3,7 +3,7 @@ package com.sf.order.service;
 
 import com.sf.order.domain.OrderInfo;
 import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
 import com.sf.order.domain.res.OrderListResVo;
 
 import java.util.List;
@@ -35,7 +35,7 @@ public interface IOrderInfoService
     /**
      * 查询订单基础信息列表
      */
-    List<OrderListResVo> queryList(OrderListreqVo vo);
+    List<OrderListResVo> queryList(OrderListReqVo vo);
 
     /**
      * 新增订单基础信息

sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java

@@ -5,7 +5,7 @@ import com.sf.common.utils.DateUtils;
 import com.sf.common.utils.SnowflakeIdWorker;
 import com.sf.order.domain.OrderInfo;
 import com.sf.order.domain.dto.OrderCreateDto;
-import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.req.OrderListReqVo;
 import com.sf.order.domain.res.OrderListResVo;
 import com.sf.order.mapper.OrderInfoMapper;
 import com.sf.order.service.IOrderInfoService;
@@ -51,7 +51,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService
     {
         return orderInfoMapper.selectOrderInfoList(orderInfo);
     }
-    public List<OrderListResVo> queryList(OrderListreqVo vo)
+    public List<OrderListResVo> queryList(OrderListReqVo vo)
     {
         return orderInfoMapper.queryList(vo);
     }

sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -30,12 +30,23 @@
         <result property="payData"    column="pay_data"    />
         <result property="reductionAmout"    column="reduction_amout"    />
     </resultMap>
+    <resultMap type="OrderListResVo" id="OrderListResVo">
+        <result property="id"    column="id"    />
+        <result property="orderNo"    column="order_no"    />
+        <result property="orderStatus"    column="order_status"    />
+        <result property="orderAmt"    column="order_amt"    />
+        <result property="productTitle"    column="product_title"    />
+        <result property="productPicture"    column="product_picture"    />
+        <result property="goodsSpec"    column="goods_spec"    />
+        <result property="goodsCount"    column="goods_count"    />
+    </resultMap>
 
     <sql id="selectOrderInfoVo">
         select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
     </sql>
     <sql id="OrderListResVo">
-        select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+        SELECT a.order_no,a.order_status,a.order_amt,b.product_title,b.product_picture,b.product_desc,b.goods_spec
+        FROM ORDER_INFO a LEFT JOIN GOODS_MESSAGES b ON a.goods_id = b.id
     </sql>
 
     <select id="selectOrderInfoList" parameterType="OrderInfo" resultMap="OrderInfoResult">
@@ -65,13 +76,18 @@
         </where>
     </select>
 
+    <select id="queryList" parameterType="OrderListReqVo" resultMap="OrderListResVo">
+        <include refid="OrderListResVo"/>
+        <where>
+            <if test="orderStatus != null "> and order_status = #{orderStatus}</if>
+            <if test="userId != null "> and create_user_id = #{userId}</if>
+        </where>
+    </select>
+
     <select id="selectOrderInfoById" parameterType="Long" resultMap="OrderInfoResult">
         <include refid="selectOrderInfoVo"/>
         where id = #{id}
     </select>
-    <select id="queryList" resultType="com.sf.order.domain.res.OrderListResVo">
-
-    </select>
 
     <insert id="insertOrderInfo" parameterType="OrderInfo">
         insert into ORDER_INFO