列表展示商品信息

src/main/java/com/mmc/oms/dao/mall/PointsOrderDao.java

@@ -3,6 +3,7 @@ package com.mmc.oms.dao.mall;
 import com.mmc.oms.entity.mall.PointsOrderDO;
 import com.mmc.oms.model.qo.GeneralQO;
 import com.mmc.oms.model.qo.PointsMallOrderQO;
+import com.mmc.oms.model.vo.mall.PointsOrderVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -29,6 +30,6 @@ public interface PointsOrderDao {
 
     int updateByPrimaryKey(PointsOrderDO record);
 
-    List<PointsOrderDO> getOrderList(PointsMallOrderQO qo);
+    List<PointsOrderVO> getOrderList(PointsMallOrderQO qo);
     int countOrderList(PointsMallOrderQO qo);
 }

src/main/java/com/mmc/oms/entity/mall/PointsOrderDO.java

@@ -70,4 +70,5 @@ public class PointsOrderDO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
 }
\ No newline at end of file

src/main/java/com/mmc/oms/model/vo/mall/PointsOrderVO.java

+package com.mmc.oms.model.vo.mall;
+
+import com.mmc.oms.entity.mall.PointsMallDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PointsOrderVO {
+    private Integer id;
+    /**
+     * 购买积分商品的用户id
+     */
+    @ApiModelProperty(value = "购买积分商品的用户id")
+    private Integer userId;
+
+    /**
+     * 积分商城id
+     */
+    @ApiModelProperty(value = "积分商城id ")
+    private Integer pointsMallId;
+
+    /**
+     * 快递地址
+     */
+    @ApiModelProperty(value = "快递地址")
+    private String address;
+
+    /**
+     * 快递单号
+     */
+    @ApiModelProperty(value = "快递单号")
+    private String trackingNumber;
+
+    /**
+     * 收货姓名
+     */
+    @ApiModelProperty(value = "收货姓名")
+    private String userName;
+
+    /**
+     * 收货电话
+     */
+    @ApiModelProperty(value = "收货电话")
+    private String userPhone;
+
+    /**
+     * 快递公司
+     */
+    @ApiModelProperty(value = "快递公司")
+    private String trackintCompany;
+
+    /**
+     * 是否发货
+     */
+    @ApiModelProperty(value = "是否发货 1发货 0没")
+    private Integer sendStatus;
+
+    /**
+     * 所需积分
+     */
+    @ApiModelProperty(value = "所需积分")
+    private Integer needPoints;
+
+    /**
+     * 商品名字
+     */
+    @ApiModelProperty(value = "商品名字")
+    private String goods;
+
+    /**
+     * 商品图片
+     */
+    @ApiModelProperty(value = "商品图片")
+    private String goodsUrl;
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/mmc/oms/service/mall/impl/PointsMallServiceImpl.java

@@ -9,6 +9,7 @@ import com.mmc.oms.entity.mall.PointsOrderDO;
 import com.mmc.oms.feign.UserAppApi;
 import com.mmc.oms.model.qo.GeneralQO;
 import com.mmc.oms.model.qo.PointsMallOrderQO;
+import com.mmc.oms.model.vo.mall.PointsOrderVO;
 import com.mmc.oms.service.mall.PointMallService;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -104,7 +105,8 @@ public class PointsMallServiceImpl implements PointMallService {
         }
         Integer pageNo = qo.getPageNo();
         qo.buildCurrentPage();
-        List<PointsOrderDO> orderList = pointsOrderDao.getOrderList(qo);
+        List<PointsOrderVO> orderList = pointsOrderDao.getOrderList(qo);
+
         return ResultBody.success(PageResult.buildPage(pageNo,qo.getPageSize(),count,orderList));
     }
 

src/main/resources/mapper/PointsOrderDao.xml

@@ -31,24 +31,29 @@
         from points_order
         where  id = #{id,jdbcType=INTEGER} 
     </select>
-    <select id="getOrderList" resultType="com.mmc.oms.entity.mall.PointsOrderDO">
-        select
-        <include refid="Base_Column_List" />
+
+    <select id="countOrderList" resultType="java.lang.Integer">
+        select count(1)
         from points_order
         where 1=1
         <if test="userId != null">
             and user_id = #{userId,jdbcType=INTEGER}
         </if>
-        order by create_time desc
-        limit #{pageNo},#{pageSize}
     </select>
-    <select id="countOrderList" resultType="java.lang.Integer">
-        select count(1)
+    <select id="getOrderList" resultType="com.mmc.oms.model.vo.mall.PointsOrderVO">
+        select
+        id,
+        user_id,points_mall_id,address,
+        tracking_number,user_name,user_phone,
+        trackint_company,send_status,need_points,goods,goods_url
         from points_order
+        inner join points_mall on points_order.points_mall_id = points_mall.id
         where 1=1
         <if test="userId != null">
             and user_id = #{userId,jdbcType=INTEGER}
         </if>
+        order by create_time desc
+        limit #{pageNo},#{pageSize}
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">