From f1f609563ab81146aa8245047cbe1791e0c914e0 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 1 Jul 2024 16:33:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=AC=BE=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/OrderController.php | 4 ++++
 app/api/logic/order/OrderLogic.php           | 3 +--
 app/common/logic/PayNotifyLogic.php          | 6 +++++-
 app/common/logic/PaymentLogic.php            | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php
index 1e2835ed7..a72a22068 100644
--- a/app/api/controller/order/OrderController.php
+++ b/app/api/controller/order/OrderController.php
@@ -249,6 +249,10 @@ class OrderController extends BaseApiController
         }
 
         switch ($pay_type) {
+            case PayEnum::PURCHASE_FUNDS:
+                //采购款支付
+                PayNotifyLogic::handle('purchase_funds', $order['order_id']);
+                return $this->success('采购款支付成功');
             case PayEnum::BALANCE_PAY:
                 //余额支付
                 PayNotifyLogic::handle('balancePay', $order['order_id']);
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index b4e262428..6df78f2ad 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -61,7 +61,6 @@ class OrderLogic extends BaseLogic
      */
     static public function cartIdByOrderInfo($cartId, $addressId, $user = null, $params = [])
     {
-
         $where = ['is_pay' => 0];
         $cart_select = Cart::whereIn('id', $cartId)->where($where)->field('id,product_id,cart_num')->select()->toArray();
         if (empty($cart_select)) {
@@ -174,7 +173,7 @@ class OrderLogic extends BaseLogic
             }
             //处理返回最近的店铺
             $store['near_store'] = [];
-            if ((isset($params['lat']) && $params['lat'] != '') && (isset($params['long']) && $params['lat'] != '')) {
+            if ((isset($params['lat']) && $params['lat'] != '') && (isset($params['long']) && $params['long'] != '')) {
                 $storeAll = SystemStore::field('id,name,phone,address,detailed_address,latitude,longitude')->select()->toArray();
                 $nearestStore = null;
                 $minDistance = PHP_FLOAT_MAX;
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 05e9c128a..54b32748a 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -1227,7 +1227,11 @@ class PayNotifyLogic extends BaseLogic
      */
     public static function dealGoodsLeft($cart_id,$uid,$oid)
     {
-        $cart_id['cart_id'] = explode(',',$cart_id);
+        if(is_array($cart_id)){
+            $cart_id['cart_id'] = $cart_id;
+        }else{
+            $cart_id['cart_id'] = explode(',',$cart_id);
+        }
         $data = OrderLogic::checkLeft($cart_id,$uid,1);
         $format =  $data['detail'];
         foreach ($format as &$value){
diff --git a/app/common/logic/PaymentLogic.php b/app/common/logic/PaymentLogic.php
index 51df608a2..a49df6407 100644
--- a/app/common/logic/PaymentLogic.php
+++ b/app/common/logic/PaymentLogic.php
@@ -8,6 +8,7 @@ use app\common\enum\PayEnum;
 use app\common\model\user\UserAuth;
 use app\common\service\pay\PayService;
 use Exception;
+use support\Log;
 
 use function DI\string;
 
@@ -101,6 +102,8 @@ class PaymentLogic extends BaseLogic
         try {
             $result = $wechat->wechat->pos($order)->toArray();
         } catch (Exception $e) {
+            Log::error('条码支付报错',['message' => $e->extra['message']?? $e->getMessage(),'code'=>$e->getCode()]);
+
             if (getenv('APP_DEBUG') == true) {
                 self::$error = $e->extra['message'] ?? $e->getMessage();
             } else {