From 34265487a8a0853b659c2a51587e68be375b8fc9 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 16 Mar 2024 13:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=85=AC=E8=BD=AC?=
 =?UTF-8?q?=E8=B4=A6=E4=B8=8B=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/Enum.php                           | 1 +
 app/controller/api/store/order/StoreOrder.php | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/common/Enum.php b/app/common/Enum.php
index ff84b725..4d7b0ba0 100644
--- a/app/common/Enum.php
+++ b/app/common/Enum.php
@@ -21,6 +21,7 @@ class Enum
 
     /** 购物车下单支付**/
     const  public = 10;//对公账户
+    const  public_string = 'public';//对公账户
 
     /** 订单状态 **/
     const STATUS_WAIT_DELIVERY = 0;//待发货
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index af13d58c..a7d8f86b 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -14,6 +14,7 @@
 namespace app\controller\api\store\order;
 
 
+use app\common\Enum;
 use app\common\repositories\delivery\DeliveryOrderRepository;
 use app\common\repositories\store\order\StoreOrderCreateRepository;
 use app\common\repositories\store\order\StoreOrderReceiptRepository;
@@ -111,12 +112,16 @@ class StoreOrder extends BaseController
             return $orderCreateRepository->v2CreateOrder($key, array_search($payType, StoreOrderRepository::PAY_TYPE), $this->request->userInfo(), $cartId, $extend, $mark, $receipt_data, $takes, $couponIds, $useIntegral, $addressId, $post);
         });
 
+        if ($isPc) {
+            return app('json')->success(['order_id' => $groupOrder]);
+        }
+
         if ($groupOrder['pay_price'] == 0) {
             $this->repository->paySuccess($groupOrder);
             return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
         }
-        if ($isPc) {
-            return app('json')->success(['order_id' => $groupOrder->group_order_id]);
+        if ($payType == Enum::public_string) {  //如果是对公转账
+            return app('json')->success(['order_id' => $groupOrder]);
         }
         try {
             return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());