修改订单列表、商品列表

app/admin/lists/store_branch_product/StoreBranchProductLists.php

@@ -47,7 +47,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
     {
         $status = $this->params['status'] ?? '';
         return StoreBranchProduct::where($this->searchWhere)
-            ->field(['id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status'])
+            ->field(['id', 'product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status'])
             ->when(!empty($this->adminInfo['store_id']), function ($query) {
                 $query->where('store_id', $this->adminInfo['store_id']);
             })

app/admin/lists/store_order/StoreOrderLists.php

@@ -44,7 +44,9 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-        return StoreOrder::with('user')->where($this->searchWhere)
+        return StoreOrder::with(['user', 'product' => function ($query) {
+            $query->field(['id', 'oid', 'product_id', 'cart_info']);
+        }])->where($this->searchWhere)
             ->when(!empty($this->request->adminInfo['store_id']), function ($query) {
                 $query->where('store_id', '=', $this->request->adminInfo['store_id']);
             })

app/api/logic/order/OrderLogic.php

@@ -62,7 +62,10 @@ class OrderLogic extends BaseLogic
                 $cart_select[$k]['old_cart_id'] = implode(',', $cartId);
                 $cart_select[$k]['cart_num'] = $v['cart_num'];
                 $cart_select[$k]['verify_code'] = $params['verify_code'] ?? '';
-                $cart_select[$k]['cart_info'] = json_encode($cart_select[$k]);
+                $cartInfo = $cart_select[$k];
+                $cartInfo['name'] = $find['store_name'];
+                $cartInfo['image'] = $find['image'];
+                $cart_select[$k]['cart_info'] = json_encode($cartInfo);
                 //理论上每笔都是拆分了
                 $cart_select[$k]['name'] = $find['store_name'];
                 $cart_select[$k]['imgs'] = $find['image'];

app/common/model/store_order/StoreOrder.php

@@ -5,6 +5,7 @@ namespace app\common\model\store_order;
 use app\common\enum\OrderEnum;
 use app\common\enum\PayEnum;
 use app\common\model\BaseModel;
+use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\system_store\SystemStore;
 use app\common\model\user\User;
 use think\model\concern\SoftDelete;
@@ -44,4 +45,9 @@ class StoreOrder extends BaseModel
         return $this->hasOne(User::class, 'id', 'uid')->bind(['nickname', 'avatar']);
     }
 
+    public function product()
+    {
+        return $this->hasMany(StoreOrderCartInfo::class, 'oid', 'id');
+    }
+
 }

app/common/model/store_order_cart_info/StoreOrderCartInfo.php

@@ -11,9 +11,11 @@ class StoreOrderCartInfo extends BaseModel
     use SoftDelete;
     protected $name = 'store_order_cart_info';
     protected $deleteTime = 'delete_time';
+    protected $json = ['cart_info'];
+    protected $jsonAssoc = true;
 
     public function goodsName()
     {
         return $this->hasOne(StoreBranchProduct::class,'id','product_id')->bind(['store_name','image','unit','price']);
     }
-}
+}

app/store/controller/store_product/StoreProductController.php

@@ -33,6 +33,7 @@ class StoreProductController extends BaseAdminController
         ApiDoc\Query(ref: [Definitions::class, "page"]),
         ApiDoc\ResponseSuccess("data", type: "array", children: [
             ['name' => 'id', 'desc' => 'ID', 'type' => 'int'],
+            ['name' => 'product_id', 'desc' => '商品ID', 'type' => 'int'],
             ['name' => 'image', 'desc' => '图片', 'type' => 'string'],
             ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'],
             ['name' => 'price', 'desc' => '零售价', 'type' => 'float'],