From 3a829cae262aa5121ee00e486d5731c98678fdf7 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Thu, 1 Jun 2023 21:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=BE=85=E4=BB=98=E6=AC=BE/?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/order/OrderController.java     | 1 +
 .../src/main/java/com/ghy/order/domain/OrderMaster.java   | 2 ++
 .../java/com/ghy/order/request/SysOrderAssignRequest.java | 3 +++
 .../src/main/resources/mapper/order/OrderMasterMapper.xml | 8 ++++++++
 4 files changed, 14 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index b0888995..08c7c2ab 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -225,6 +225,7 @@ public class OrderController extends BaseController {
         orderMaster.setCustomerId(customer.getCustomerId());
         orderMaster.setGoodsId(goods.getGoodsId());
         orderMaster.setPayType(0);
+        orderMaster.setOrderMode(request.getOrderMode());
         // 服务时间
         String[] split = request.getServTime().split("-");
         try {
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
index d611cfbf..c496a307 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
@@ -139,4 +139,6 @@ public class OrderMaster extends BaseEntity {
      * 超时扣款次数
      */
     private Integer timeoutFineTimes;
+
+    private String orderMode;
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java b/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java
index a7fb8ebc..5ef23d23 100644
--- a/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java
+++ b/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java
@@ -47,4 +47,7 @@ public class SysOrderAssignRequest {
     private String servDate;
 
     private String servTime;
+
+    private String orderMode;
+
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 7c99bcbe..8ffe7262 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -11,6 +11,7 @@
         <result property="customerId"        column="customer_id"/>
         <result property="addressId"         column="address_id"/>
         <result property="orderType"         column="order_type"/>
+        <result property="orderMode"         column="order_mode"/>
         <result property="orderStatus"       column="order_status"/>
         <result property="payType"           column="pay_type"/>
         <result property="payStatus"         column="pay_status"/>
@@ -38,6 +39,7 @@
                customer_id,
                address_id,
                order_type,
+               order_mode,
                order_status,
                pay_type,
                pay_status,
@@ -63,6 +65,7 @@
                om.customer_id,
                om.address_id,
                om.order_type,
+               om.order_mode,
                om.order_status,
                om.pay_type,
                om.pay_status,
@@ -82,6 +85,7 @@
         FROM order_master om
         LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
         LEFT JOIN goods g ON g.goods_id = om.goods_id
+        LEFT JOIN financial_master fm ON om.id = fm.order_master_id
     </sql>
 
     <select id="selectOrderMasterList" parameterType="com.ghy.order.domain.OrderMaster" resultMap="OrderMasterResult">
@@ -128,6 +132,8 @@
             </if>
             <if test="workerId == -1">
                 AND om.worker_id IS NULL
+                AND ( (om.order_mode in ('01','03','04'))
+                     OR (om.order_mode = '02' and fm.pay_status = 1) )
             </if>
             <if test="goodsCategoryId != null">
                 AND g.dept_goods_category_id = #{goodsCategoryId}
@@ -295,6 +301,7 @@
         <if test="addressId != null and addressId != 0">address_id,</if>
         <if test="goodsId != null and goodsId != 0">goods_id,</if>
         <if test="orderType != null">order_type,</if>
+        <if test="orderMode != null">order_mode,</if>
         <if test="orderStatus != null">order_status,</if>
         <if test="payType != null">pay_type,</if>
         <if test="payStatus != null">pay_status,</if>
@@ -313,6 +320,7 @@
         <if test="addressId != null and addressId != 0">#{addressId},</if>
         <if test="goodsId != null and goodsId != 0">#{goodsId},</if>
         <if test="orderType != null">#{orderType},</if>
+        <if test="orderMode != null">#{orderMode},</if>
         <if test="orderStatus != null">#{orderStatus},</if>
         <if test="payType != null">#{payType},</if>
         <if test="payStatus != null">#{payStatus},</if>