From 5e73e0c256323922b34c616d40f6d5d6f4f12741 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 10 May 2024 10:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/goods/GoodsclassLists.php     | 21 ++++++++++---------
 .../order/RetailOrderController.php           | 11 +++++++++-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/admin/lists/goods/GoodsclassLists.php b/app/admin/lists/goods/GoodsclassLists.php
index 9560cad..fec990d 100644
--- a/app/admin/lists/goods/GoodsclassLists.php
+++ b/app/admin/lists/goods/GoodsclassLists.php
@@ -43,18 +43,19 @@ class GoodsclassLists extends BaseAdminDataLists implements ListsSearchInterface
     public function lists(): array
     {
         $lists = Goodsclass::where($this->searchWhere)
-            ->where('pid', 0)
             ->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()->each(function ($item) {
-                $a = Goodsclass::where('pid', $item['id'])->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])->select();
-                $item['children'] = $a;
-                foreach ($a as $k => &$v) {
-                    $b = Goodsclass::where('pid', $v['id'])->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])->select();
-                    $v['children'] = $b;
-                }
-            })->toArray();
+            ->select()
+            // ->each(function ($item) {
+            //     $a = Goodsclass::where('pid', $item['id'])->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])->select();
+            //     $item['children'] = $a;
+            //     foreach ($a as $k => &$v) {
+            //         $b = Goodsclass::where('pid', $v['id'])->field(['id', 'pid', 'name', 'data', 'pic', 'sort'])->select();
+            //         $v['children'] = $b;
+            //     }
+            // })
+            ->toArray();
         return $lists;
         // return linear_to_tree($lists, 'children');
 
@@ -69,7 +70,7 @@ class GoodsclassLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function count(): int
     {
-        return Goodsclass::where($this->searchWhere)->where('pid', 0)
+        return Goodsclass::where($this->searchWhere)
             ->count();
     }
 
diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php
index e14df7b..26a488e 100644
--- a/app/api/controller/order/RetailOrderController.php
+++ b/app/api/controller/order/RetailOrderController.php
@@ -85,7 +85,11 @@ class RetailOrderController extends BaseApiController
         }
 
         if($pay_type==9){
-
+            if(empty($this->request->userInfo['merchant'])){
+                return $this->fail('请先绑定商户');
+            }
+            $mer_id=$this->request->userInfo['merchant']['mer_id'];
+            $params['mer_id']=$mer_id;
         }
         $order = OrderLogic::createOrder($cartId, $addressId, null, $params);
         if ($order != false) {
@@ -146,8 +150,11 @@ class RetailOrderController extends BaseApiController
             'paid' => 0,
         ];
         $order = Cashierclass::where($where)->find();
+        if(!$order) return $this->fail('订单不存在或已支付');
+
         switch ($pay_type) {
             case PayEnum::BALANCE_PAY:
+                //余额支付
                 $user = User::where('id', $this->request->userId)->find();
                 $res = RetailOrderLogic::payBalance($user, $order);
                 if (!RetailOrderLogic::hasError()) {
@@ -161,6 +168,7 @@ class RetailOrderController extends BaseApiController
                 }
                 break;
             case PayEnum::WECHAT_PAY:
+                //微信支付
                 $redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
                 if ($addressId != $order['address_id']) {
                     $address = UserAddress::where(['address_id' => $addressId, 'uid' => Request()->userId])->find();
@@ -179,6 +187,7 @@ class RetailOrderController extends BaseApiController
                 return $this->success('', $result);
                 break;
             case  PayEnum::WECHAT_PAY_BARCODE:
+                //微信条码支付
                 $result = PaymentLogic::codepay($auth_code, $order);
                 if (PaymentLogic::hasError()) {
                     return $this->fail(PaymentLogic::getError(), $params);