From 69a95f665ac1703c344e494ebd28094ab2d4aa55 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 5 Jul 2022 14:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/order/domain/OrderDetail.java     |  6 ++
 .../mapper/order/OrderDetailMapper.xml        | 58 ++++++++++++++++---
 .../mapper/order/OrderMasterMapper.xml        |  2 +-
 3 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index 07b69f44..ec07cfa2 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -56,4 +56,10 @@ public class OrderDetail extends BaseEntity {
     private Date workFinishTime;
 
     private Date createTime;
+
+    private Long goodsCategoryId;
+
+    private String goodsName;
+
+    private Long countryId;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index f7d75f7d..bbf63d5f 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -45,29 +45,71 @@
         FROM order_detail
     </sql>
 
+    <sql id="selectOrderDetailMoreInfo">
+        SELECT od.id,
+               od.code,
+               od.order_master_id,
+               od.order_master_code,
+               od.customer_id,
+               od.order_type,
+               od.order_status,
+               od.worker_id,
+               od.rev_time,
+               od.expect_time_start,
+               od.expect_time_end,
+               od.work_begin_time,
+               od.work_finish_time,
+               od.create_by,
+               od.create_time,
+               od.remark
+        FROM order_detail od
+        LEFT JOIN order_master om ON om.id = od.order_master_id
+        LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
+        LEFT JOIN goods g ON g.goods_id = om.goods_id
+    </sql>
+
     <select id="selectOrderDetailList" parameterType="com.ghy.order.domain.OrderDetail" resultMap="OrderDetailResult">
-        <include refid="selectOrderDetail"/>
+        <include refid="selectOrderDetailMoreInfo"/>
         <where>
             <if test="code != null and code != ''">
-                AND code LIKE concat('%', #{code}, '%')
+                AND od.code LIKE concat('%', #{code}, '%')
             </if>
             <if test="customerId != null and customerId != 0">
-                AND customer_id = #{customerId}
+                AND od.customer_id = #{customerId}
             </if>
             <if test="orderType != null">
-                AND order_type = #{orderType}
+                AND od.order_type = #{orderType}
             </if>
             <if test="orderStatus != null">
-                AND order_status = #{orderStatus}
+                AND od.order_status = #{orderStatus}
             </if>
             <if test="orderMasterCode != null and orderMasterCode != 0">
-                AND order_detail_code = #{orderMasterCode}
+                AND od.order_detail_code = #{orderMasterCode}
             </if>
             <if test="workerId != null and workerId != 0">
-                AND worker_id = #{workerId}
+                AND od.worker_id = #{workerId}
+            </if>
+            <if test="goodsCategoryId != null">
+                AND g.dept_goods_category_id = #{goodsCategoryId}
+            </if>
+            <if test="goodsName != null and goodsName != ''">
+                AND g.goods_name like concat('%', #{goodsName}, '%')
+            </if>
+            <if test="countryId != null">
+                AND ca.country_id = #{countryId}
             </if>
         </where>
-        order by create_time desc
+        order by od.create_time
+        <trim suffixOverrides=",">
+            <choose>
+                <when test="params.createTimeSort != null and params.createTimeSort != ''">
+                    ${params.createTimeSort}
+                </when>
+                <otherwise>
+                    desc
+                </otherwise>
+            </choose>
+        </trim>
     </select>
 
     <select id="selectById" parameterType="long" resultMap="OrderDetailResult">
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 15fc7e9e..bd8314d4 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -111,7 +111,7 @@
                 AND ca.country_id = #{countryId}
             </if>
         </where>
-        order by create_time
+        order by om.create_time
         <trim suffixOverrides=",">
             <choose>
                 <when test="params.createTimeSort != null and params.createTimeSort != ''">