diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php index 4f3bde68..95e5caef 100644 --- a/app/admin/lists/store_order/StoreOrderLists.php +++ b/app/admin/lists/store_order/StoreOrderLists.php @@ -4,6 +4,7 @@ namespace app\admin\lists\store_order; use app\admin\lists\BaseAdminDataLists; +use app\common\enum\OrderEnum; use app\common\enum\PayEnum; use app\common\model\store_order\StoreOrder; use app\common\lists\ListsSearchInterface; @@ -52,6 +53,9 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface ->order(['id' => 'desc']) ->select()->each(function($item){ $item['pay_type_name']=PayEnum::getPaySceneDesc($item['pay_type']); + $item['pay_time']=$item['pay_time']>0?date('Y-m-d H:i:s',$item['pay_time']):''; + $item['status_name']= OrderEnum::getOrderType($item['status'])??''; + return $item; }) ->toArray(); diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php index 93387ee2..71442bf2 100644 --- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php @@ -6,7 +6,9 @@ namespace app\admin\lists\store_order_cart_info; use app\admin\lists\BaseAdminDataLists; use app\common\enum\PayEnum; use app\common\lists\ListsSearchInterface; +use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_order_cart_info\StoreOrderCartInfo; +use app\common\model\store_product\StoreProduct; /** * 订单购物详情列表 @@ -43,10 +45,17 @@ class StoreOrderCartInfoLists extends BaseAdminDataLists implements ListsSearchI public function lists(): array { return StoreOrderCartInfo::where($this->searchWhere) - ->field('cart_info')->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) + ->field('cart_info,product_id')->limit($this->limitOffset, $this->limitLength) ->select()->each(function ($item) { $item['cart_info'] = json_decode($item['cart_info'], true); //将json字符串转换为数组,方便使用其中的数据。 + $find=StoreBranchProduct::where('id',$item['product_id'])->field('image,store_name')->find(); + if($find){ + $item['image']=$find['image'];//商品图片 + $item['store_name']=$find['store_name'];//商品名称 + }else{ + $item['image']='';//商品图片 + $item['store_name']='';//商品名称 + } return $item; //返回处理后的数据。 }) ->toArray(); diff --git a/app/admin/logic/store_order/StoreOrderLogic.php b/app/admin/logic/store_order/StoreOrderLogic.php index 83f6aba1..23379ef9 100644 --- a/app/admin/logic/store_order/StoreOrderLogic.php +++ b/app/admin/logic/store_order/StoreOrderLogic.php @@ -92,7 +92,8 @@ class StoreOrderLogic extends BaseLogic { $data= StoreOrder::findOrEmpty($params['id']); if($data){ - $data['status_name']=$data->status_name_Text; + $data['status_name']=$data->status_name_text; + $data['pay_time']=date('Y-m-d H:i:s',$data['pay_time']); } return $data?->toArray(); }