From 95554cdd3328047993ea387080a11ca4986ffd30 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 4 Jun 2024 17:05:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BA=86=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=A7=E5=93=81=E7=9A=84=E5=9B=BE=E7=89=87=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=92=8C=E5=BA=93=E5=AD=98=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/WorkbenchController.php          |  6 +++---
 .../StoreBranchProductController.php                  |  1 +
 app/admin/logic/store_order/StoreOrderLogic.php       | 11 ++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php
index 4b9c69853..49d431c85 100644
--- a/app/admin/controller/WorkbenchController.php
+++ b/app/admin/controller/WorkbenchController.php
@@ -488,7 +488,7 @@ class WorkbenchController extends BaseAdminController
                 "changes" => "0.06",
                 "repeats" => "0.28",
                 "store_name" => "瞌睡兔 美式复古圆领卫衣外套女春秋款小个子宽松百搭休闲上衣",
-                "image" => "https=>//multi-store.crmeb.net/uploads/attach/2024/02/19/2f3f938d720fc4212216ab855808bf85.jpg",
+                "image" => "https://multi-store.crmeb.net/uploads/attach/2024/02/19/2f3f938d720fc4212216ab855808bf85.jpg",
                 "product_price" => "100.00",
                 "stock" => 16777213,
                 "is_show" => 1
@@ -507,7 +507,7 @@ class WorkbenchController extends BaseAdminController
                 "changes" => "0.13",
                 "repeats" => "0.14",
                 "store_name" => "ECOK2024年春秋季美式复古美拉德风高级感撞色领拉链夹克外套女潮",
-                "image" => "https=>//multi-store.crmeb.net/uploads/attach/2024/02/19/5bf089c30da5bdddd815fbf2cba148e6.jpg",
+                "image" => "https://multi-store.crmeb.net/uploads/attach/2024/02/19/5bf089c30da5bdddd815fbf2cba148e6.jpg",
                 "product_price" => "169.90",
                 "stock" => 2980,
                 "is_show" => 1
@@ -526,7 +526,7 @@ class WorkbenchController extends BaseAdminController
                 "changes" => "0.04",
                 "repeats" => "0.50",
                 "store_name" => "【618抢先购】CT四色眼影盘新色枕边话哑光亮片粉棕彩妆官方正品",
-                "image" => "https=>//multi-store.crmeb.net/uploads/attach/2024/05/24/fc63ee052b9dc66bd70a1e013510ded2.jpg",
+                "image" => "https://multi-store.crmeb.net/uploads/attach/2024/05/24/fc63ee052b9dc66bd70a1e013510ded2.jpg",
                 "product_price" => "490.00",
                 "stock" => 139994,
                 "is_show" => 1
diff --git a/app/admin/controller/store_branch_product/StoreBranchProductController.php b/app/admin/controller/store_branch_product/StoreBranchProductController.php
index de64c7069..49e1e8496 100644
--- a/app/admin/controller/store_branch_product/StoreBranchProductController.php
+++ b/app/admin/controller/store_branch_product/StoreBranchProductController.php
@@ -55,6 +55,7 @@ class StoreBranchProductController extends BaseAdminController
      */
     public function edit()
     {
+        d(1);
         $params = (new StoreProductValidate())->post()->goCheck('edit');
         $result = StoreProductLogic::edit($params);
         if (true === $result) {
diff --git a/app/admin/logic/store_order/StoreOrderLogic.php b/app/admin/logic/store_order/StoreOrderLogic.php
index 40775b8a1..e515e6383 100644
--- a/app/admin/logic/store_order/StoreOrderLogic.php
+++ b/app/admin/logic/store_order/StoreOrderLogic.php
@@ -5,6 +5,7 @@ namespace app\admin\logic\store_order;
 
 use app\common\model\store_order\StoreOrder;
 use app\common\logic\BaseLogic;
+use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use think\facade\Db;
 
 
@@ -89,6 +90,14 @@ class StoreOrderLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return StoreOrder::findOrEmpty($params['id'])->toArray();
+        $data= StoreOrder::findOrEmpty($params['id'])->toArray();
+        if($data){
+            $data['_info']=StoreOrderCartInfo::where('oid',$data['id'])->field('cart_info')
+            ->select()->each(function ($item){
+                $item['cart_info']=json_decode($item['cart_info'],true);//将json字符串转换为数组，方便使用其中的数据。
+                return $item;//返回处理后的数据。
+            });
+        }
+        return $data;
     }
 }
\ No newline at end of file