diff --git a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java index 98b755a..c0e0d17 100644 --- a/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java +++ b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListReqVo.java @@ -1,9 +1,13 @@ package com.sf.order.domain.req; +import com.sf.common.core.domain.BaseEntity; import lombok.Data; @Data -public class OrderListReqVo { +public class OrderListReqVo extends BaseEntity { + + private static final long serialVersionUID = 1L; + /** * 主键id */ diff --git a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java index 7d13bd1..1c7a63d 100644 --- a/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java +++ b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java @@ -46,7 +46,7 @@ public class OrderListResVo { /** * 商品规格 */ - private Integer goodsSpec; + private String goodsSpec; /** * 商品数量 */ diff --git a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml index e2a305d..207b139 100644 --- a/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -44,7 +44,7 @@ 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 - + 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 @@ -77,10 +77,10 @@