From f2d777d5e3a435c688f0912d41d508d2ca6a3e41 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 13 Jun 2024 17:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E4=B8=BA0?=
 =?UTF-8?q?=E6=97=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/OrderController.php | 3 +++
 app/common/enum/OrderEnum.php                | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php
index fa1f79a2..70ec3e5a 100644
--- a/app/api/controller/order/OrderController.php
+++ b/app/api/controller/order/OrderController.php
@@ -185,6 +185,9 @@ class OrderController extends BaseApiController
         $user=User::where('id',$this->userId)->find();
 
         $order = OrderLogic::createOrder($cartId, $addressId, $user, $params);
+        if($order['pay_price'] <= 0){
+            $pay_type = 3;
+        }
         if ($order != false) {
             switch ($pay_type) {
                 case PayEnum::BALANCE_PAY:
diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php
index c6ea7ec5..4c056021 100644
--- a/app/common/enum/OrderEnum.php
+++ b/app/common/enum/OrderEnum.php
@@ -28,12 +28,16 @@ class OrderEnum
     const SUPPLIER_ORDER_OBTAINS  = 6;
     const PLATFORM_ORDER_PAY  = 7;
     const SYSTEM_SET  = 8;
-    const CASHIER_ORDER_PAY  = 9;
+    const CASHIER_ORDER_PAY  = 9;//微信条码
     const CASHIER_CASH_ORDER_PAY  = 10;
 
     const ORDER_MARGIN = 11;
     const ORDER_COMMITION = 12;
 
+    const CASHIER_ORDER_ALI_PAY  = 13;//支付宝条码
+
+    const CASHIER_FACE_PAY  = 17;//现金收银
+
 
     /**
      * 收入支出类型
@@ -87,6 +91,7 @@ class OrderEnum
 
     /**小程序下单**/
     const ONLINE = [1,2];
+    const OFFLINE = [3];
     /**
      * 账户类型
      * @USER 用户