From 908092f39d259c6853fa57846e6189a78d11ba99 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 17 Sep 2024 08:53:09 +0800
Subject: [PATCH] feat(OrderController, StoreOrderController): updated logic
 for gift funds payment, fixed bugs, improved code quality

---
 app/api/controller/order/OrderController.php              | 4 +++-
 app/store/controller/store_order/StoreOrderController.php | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php
index b50eaa188..3a126f617 100644
--- a/app/api/controller/order/OrderController.php
+++ b/app/api/controller/order/OrderController.php
@@ -152,7 +152,9 @@ class OrderController extends BaseApiController
                 return $this->fail('密码错误');
             }
         }
-
+        if ($pay_type == PayEnum::GIFT_FUNDS) {
+            return $this->fail('不能使用礼品券支付');
+        }
         $order = OrderLogic::createOrder($cartId, $addressId, $user, $params);
         if ($order != false) {
             if ($order['pay_price'] <= 0) {
diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php
index e03a0b68f..5d7939187 100644
--- a/app/store/controller/store_order/StoreOrderController.php
+++ b/app/store/controller/store_order/StoreOrderController.php
@@ -206,6 +206,9 @@ class StoreOrderController extends BaseAdminController
         $params['store_id'] = $this->request->adminInfo['store_id']; //当前登录的店铺id，用于判断是否是当前店铺的订单
         $params['shipping_type'] =3;
         $params['source'] =1;
+        if ($pay_type == PayEnum::GIFT_FUNDS) {
+            return $this->fail('不能使用礼品券支付');
+        }
         $order = OrderLogic::createOrder($cartId, $addressId, $user, $params);
         if ($order != false) {
             switch ($pay_type) {