From 64d978358ae1160298bf8b258d71c5736fdfaac0 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 1 Jul 2024 15:46:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9UserController?=
 =?UTF-8?q?=E5=92=8COrderLogic=E7=B1=BB=E4=BB=A5=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/user/UserController.php | 4 ++--
 app/api/logic/order/OrderLogic.php         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php
index 12a550175..301a16a8d 100644
--- a/app/api/controller/user/UserController.php
+++ b/app/api/controller/user/UserController.php
@@ -232,8 +232,8 @@ class UserController extends BaseApiController
         $params['page_size'] = $page_size > 0 ? $page_size : 15;
         $res = UserLogic::dealDetails($params,$this->userId);
         $integral = User::where('id',$this->userId)->value('integral');
-        $number = UserSign::where('id',$this->userId)->where('status',0)->sum('number');
-        $GetNumber = UserSign::where('id',$this->userId)->where('status',1)->sum('number');
+        $number = 0;//UserSign::where('id',$this->userId)->where('status',0)->sum('number');
+        $GetNumber = 0;//UserSign::where('id',$this->userId)->where('status',1)->sum('number');
         $res['page_no'] = $params['page_no'];
         $res['page_size'] = $params['page_size'];
         $res['extend'] = [
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index bb31af72d..1ca3ab514 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -83,9 +83,10 @@ class OrderLogic extends BaseLogic
             foreach ($cart_select as $k => $v) {
                 $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field($field)->withTrashed()->find();
                 if (!$find) {
+                    unset($cart_select[$k]);
                     continue;
                 }
-                unset($cart_select[$k]['id']);
+                // unset($cart_select[$k]['id']);
                 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
                 if ($off_activity == 1) {
                     $price = $find['cost'];
@@ -210,6 +211,7 @@ class OrderLogic extends BaseLogic
         if (!$orderInfo) {
             return false;
         }
+        d($orderInfo);
         $uid = $user['id'] ?? 0;
         $_order = $orderInfo['order'];
         $_order['uid'] = $uid;