From d33ae2fbc082dcb4f46cb68358282ac6de05238b Mon Sep 17 00:00:00 2001
From: Lemon <1730392988@qq.com>
Date: Wed, 21 Jul 2021 16:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/dto/OrderShipmentPageReq.java      | 43 +++----------------
 .../mapper/order/OrderShipmentMapper.xml      | 30 +++----------
 2 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/src/main/java/com/time/store/order/entity/dto/OrderShipmentPageReq.java b/src/main/java/com/time/store/order/entity/dto/OrderShipmentPageReq.java
index fe7cd40..170e466 100644
--- a/src/main/java/com/time/store/order/entity/dto/OrderShipmentPageReq.java
+++ b/src/main/java/com/time/store/order/entity/dto/OrderShipmentPageReq.java
@@ -5,51 +5,22 @@ import lombok.Data;
 
 @Data
 public class OrderShipmentPageReq extends BasePageRequest {
-    /**
-     * id
-     */
-    private Integer id;
-    /**
-     * 发货编号
-     */
-    private String shipmentNo;
-    /**
-     * 订单编号
-     */
-    private String orderNo;
-    /**
-     * 订单ID
-     */
-    private Integer orderId;
-
 
     /**
-     * 操作类型(0:单条发货,1批量发货)
-     */
-    private Integer operationType;
-    /**
-     * 发货状态(0:已发货)
+     * 状态
      */
     private Integer  deliveryStatus;
 
     /**
-     * 发货失败原因
-     */
-    private String failReason;
-    /**
-     * 物流编号
-     */
-    private String tackingNo;
-    /**
-     * 物流名称 中通,申通 等
+     * 操作用户登录名
      */
-    private String tackingName;
+    private String operatorLoginName;
     /**
-     * 操作用户id
+     * 创建时间开始时间
      */
-    private Integer operatorUserId;
+    private String createTimeStart;
     /**
-     * 操作用户登录名
+     * 创建时间结束时间
      */
-    private String operatorLoginName;
+    private String createTimeEnd;
 }
diff --git a/src/main/resources/mapper/order/OrderShipmentMapper.xml b/src/main/resources/mapper/order/OrderShipmentMapper.xml
index ca6b0b7..b76c814 100644
--- a/src/main/resources/mapper/order/OrderShipmentMapper.xml
+++ b/src/main/resources/mapper/order/OrderShipmentMapper.xml
@@ -23,35 +23,17 @@
      </include>
      from order_shipment
      <where>
-         <if test="orderShipmentPageReq.shipmentNo != null and orderShipmentPageReq.shipmentNo != ''">
-             and shipment_no = #{orderShipmentPageReq.shipmentNo}
-         </if>
-         <if test="orderShipmentPageReq.orderNo != null and orderShipmentPageReq.orderNo != ''">
-             and order_no = #{orderShipmentPageReq.orderNo}
-         </if>
-         <if test="orderShipmentPageReq.orderId != null and orderShipmentPageReq.orderId != ''">
-             and order_id = #{orderShipmentPageReq.orderId}
-         </if>
-         <if test="orderShipmentPageReq.operationType != null and orderShipmentPageReq.operationType != ''">
-             and operation_type = #{orderShipmentPageReq.operationType}
-         </if>
          <if test="orderShipmentPageReq.deliveryStatus != null and orderShipmentPageReq.deliveryStatus != ''">
              and delivery_status = #{orderShipmentPageReq.deliveryStatus}
          </if>
-         <if test="orderShipmentPageReq.failReason != null and orderShipmentPageReq.failReason != ''">
-             and fail_reason = #{orderShipmentPageReq.failReason}
-         </if>
-         <if test="orderShipmentPageReq.tackingNo != null and orderShipmentPageReq.tackingNo != ''">
-             and tacking_no = #{orderShipmentPageReq.tackingNo}
-         </if>
-         <if test="orderShipmentPageReq.tackingName != null and orderShipmentPageReq.tackingName != ''">
-             and tacking_name = #{orderShipmentPageReq.tackingName}
+         <if test="orderShipmentPageReq.operatorLoginName != null and orderShipmentPageReq.operatorLoginName != ''">
+             and operator_login_name like  CONCAT(#{orderShipmentPageReq.operatorLoginName}, '%')
          </if>
-         <if test="orderShipmentPageReq.operatorUserId != null and orderShipmentPageReq.operatorUserId != ''">
-             and operator_user_id = #{orderShipmentPageReq.operatorUserId}
+         <if test="orderShipmentPageReq.createTimeStart != null and orderShipmentPageReq.createTimeStart != ''">
+             and create_time &gt; #{orderShipmentPageReq.createTimeStart}
          </if>
-         <if test="orderShipmentPageReq.operatorLoginName != null and orderShipmentPageReq.operatorLoginName != ''">
-             and operator_login_name = #{orderShipmentPageReq.operatorLoginName}
+         <if test="orderShipmentPageReq.createTimeEnd != null and orderShipmentPageReq.createTimeEnd != ''">
+             and create_time &lt; #{orderShipmentPageReq.createTimeEnd}
          </if>
      </where>
  </select>
-- 
Gitee