From 91ee6e8d4baa79de7349ce5c6aecc96f16fe6ce8 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 22 Jun 2024 18:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/enum/PayEnum.php                      | 1 +
 app/common/logic/store_order/StoreOrderLogic.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/common/enum/PayEnum.php b/app/common/enum/PayEnum.php
index 9bdd5dfaa..739723b2b 100644
--- a/app/common/enum/PayEnum.php
+++ b/app/common/enum/PayEnum.php
@@ -103,6 +103,7 @@ class PayEnum
             self::ALIPAY_BARCODE => '支付宝条码',
             self::BALANCE_PAY => '余额支付',
             self::PURCHASE_FUNDS => '采购款收银',
+            self::GIFT_FUNDS => '礼品券收银',
 
         ];
         if ($value === true) {
diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php
index ee40f3342..02a323abe 100644
--- a/app/common/logic/store_order/StoreOrderLogic.php
+++ b/app/common/logic/store_order/StoreOrderLogic.php
@@ -232,6 +232,9 @@ class StoreOrderLogic extends BaseLogic
         $order['refund_status_name'] = OrderEnum::refundStatus($order['refund_status']) ?? '';
         $order['refund_type_name'] = OrderEnum::refundType($order['refund_type']) ?? '';
         $order['pay_type_name'] =PayEnum::getPaySceneDesc($order['pay_type']) ?? '';
+        if ($order['pay_type'] == 19){
+            $order['deduction_price'] = 0;
+        }
 
         $detail =StoreOrderCartInfo::where('oid',$order['id'])->find()->toArray();
         $vip =0;