chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://codeup.aliyun.com/zsmarter/sac/server/smarterFramework into test

Browse Source
This commit is contained in:
张洋川 2024-04-15 17:52:03 +08:00
commit 0dbe3c713e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
*/

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

@ -46,7 +46,7 @@ public class OrderListResVo {
/**
* 商品规格
*/
private Integer goodsSpec;
private String goodsSpec;
/**
* 商品数量
*/

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

@ -44,7 +44,7 @@
<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">
<sql id="OrderListInfoVo">
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>
@ -77,10 +77,10 @@
</select>
<select id="queryList" parameterType="OrderListReqVo" resultMap="OrderListResVo">
<include refid="OrderListResVo"/>
<include refid="OrderListInfoVo"/>
<where>
<if test="orderStatus != null "> and order_status = #{orderStatus}</if>
<if test="userId != null "> and create_user_id = #{userId}</if>
<if test="orderStatus != null "> and a.order_status = #{orderStatus}</if>
<if test="userId != null "> and a.create_user_id = #{userId}</if>
</where>
</select>