From 3f7d500347231eb339955abadc78181f871175e5 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 15:41:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=AE=A2=E5=8D=95=E4=B8=8B=E5=8D=95=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/order/OrderList.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php
index f1ba4dd47..86a4e5378 100644
--- a/app/api/lists/order/OrderList.php
+++ b/app/api/lists/order/OrderList.php
@@ -52,12 +52,13 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
             ->select()
             ->each(function ($item) {
                 $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id'])
-                    ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select()
+                    ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id,cart_info')->limit(3)->select()
                     ->each(function ($v) use ($item) {
                         $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->withTrashed()->find();
                         $v['store_name'] = $find['store_name'];
                         $v['image'] = $find['image'];
-                        $v['price'] = $find['price'];
+//                        $v['price'] = $find['price'];
+                        $v['price'] = $v['cart_info']['price'];
                         $v['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name') ?? '';
                     });
                 $item['goods_count'] = count(explode(',', $item['cart_id']));

From bfb85eecd18037a2651f82081d211759ceff4eb6 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 15:44:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=86=BB=E7=BB=93?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=BE=97=E5=80=BC=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/UserLogic.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index b98b7c48c..bfd9c80b4 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -115,6 +115,10 @@ class UserLogic extends BaseLogic
             $data['openid'] = UserAuth::where(['user_id'=>$uid,'terminal'=>1])->value('openid');
             $number=UserSign::where('uid',$uid)->where('status',0)->sum('number');
             $data['integral']=bcadd($data['integral'],$number,2);
+            $number = UserSign::where('id',$uid)->where('status',0)->sum('number');
+            $GetNumber = UserSign::where('id',$uid)->where('status',1)->sum('number');
+            $data['number '] =$number;
+            $data['GetNumber'] =$GetNumber;
         }else{
             $data = [];
         }

From 379c8aea4c3558612a41facc3ce997070f034112 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 15:47:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=86=BB=E7=BB=93?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=BE=97=E5=80=BC=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/UserLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index bfd9c80b4..c14d71b0e 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -117,7 +117,7 @@ class UserLogic extends BaseLogic
             $data['integral']=bcadd($data['integral'],$number,2);
             $number = UserSign::where('id',$uid)->where('status',0)->sum('number');
             $GetNumber = UserSign::where('id',$uid)->where('status',1)->sum('number');
-            $data['number '] =$number;
+            $data['number'] =$number;
             $data['GetNumber'] =$GetNumber;
         }else{
             $data = [];