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());