From fe1f7a39a93edf440a92b23c83fe258a3690a964 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 15 八月 2023 19:36:01 +0800
Subject: [PATCH] 修改订单查询
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 19 +++++++++++++++----
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java | 6 ++++++
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
index 0a6e777..6dac51e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
@@ -65,4 +66,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
+ @ApiModelProperty(value = "查询关键字", hidden = true)
+ @JsonIgnore
+ private String keyword;
+
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index c38422d..a3eb2b2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -36,7 +36,14 @@
<result column="shopId" property="shopId" />
<result column="orderFrom" property="orderFrom" />
<result column="createTime" property="createTime" />
- <collection property="appUserOrderGoodsPageVoList" ofType="com.ruoyi.order.domain.vo.AppUserOrderGoodsPageVo" select="listOrderGoodsByOrderId" column="orderId">
+ <result column="keyword" property="keyword"/>
+ <collection property="appUserOrderGoodsPageVoList"
+ ofType="com.ruoyi.order.domain.vo.AppUserOrderGoodsPageVo"
+ select="listOrderGoodsByOrderId"
+ column="{orderId=orderId,keyword=keyword}">
+ <id column="orderGoodsId" property="orderGoodsId"/>
+ <result column="goodsId" property="goodsId"/>
+ <result column="goodsName" property="goodsName"/>
</collection>
</resultMap>
@@ -268,9 +275,9 @@
toc.receivable_money receivableMoney,
toc.goods_num goodsNum,
toc.shop_id shopId,
- toc.create_time createTime
+ toc.create_time createTime,
+ #{param.keyword} as keyword
FROM t_order toc
- INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
WHERE toc.del_flag = 0
<if test="param.userId != null">
AND toc.user_id = #{param.userId}
@@ -279,7 +286,8 @@
AND toc.order_status = #{param.orderStatus}
</if>
<if test="param.keyword != null and param.keyword != ''">
- AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR tog.goods_name LIKE CONCAT('%',#{param.keyword},'%'))
+ AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR
+ EXISTS( SELECT 1 FROM t_order_goods tog WHERE tog.order_id = toc.order_id AND tog.goods_name LIKE CONCAT('%',#{param.keyword},'%')) )
</if>
ORDER BY toc.create_time DESC
</select>
@@ -299,6 +307,9 @@
tog.service_num serviceNum
FROM t_order_goods tog
WHERE tog.order_id = #{orderId}
+ <if test="keyword != null and keyword != ''">
+ AND tog.goods_name LIKE CONCAT('%',#{keyword},'%')
+ </if>
</select>
<select id="pageMerMemberNoClearOrder" resultType="com.ruoyi.order.domain.vo.MerMemberNoClearOrderVo">
--
Gitblit v1.7.1