From bf233ef56874f5f24698e7819627770ce8f83476 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Mon, 9 Jan 2023 14:31:04 +0800
Subject: [PATCH] edit-admin-cost
---
admin/controllers/items/Cost.php | 4 +++-
admin/views/items/cost/get.php | 7 ++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/admin/controllers/items/Cost.php b/admin/controllers/items/Cost.php
index 956321ec..9022e56a 100644
--- a/admin/controllers/items/Cost.php
+++ b/admin/controllers/items/Cost.php
@@ -93,6 +93,7 @@ class Cost extends HD_Controller{
return $this->show_json(SYS_CODE_FAIL,'参数错误');
}
$order_row = $this->receiver_orders_v2_model->get(['id'=>$row['o_id']]);
+ $info_json = json_decode($order_row['info_json'],true);
$item_row = $this->items_model->get(['id'=>$row['item_id']]);
$biz = $this->biz_model->get(['id'=>$order_row['biz_id']]);
$admin = $this->app_licheb_users_model->get(['id'=>$order_row['admin_id']]);
@@ -131,7 +132,8 @@ class Cost extends HD_Controller{
'promotion_json' => $promotion_json,
'cost_json' => $cost_json,
'srv_json' => $srv_json,
- 'row' => $row
+ 'row' => $row,
+ 'business_id' => 6
];
$sum = $this->app_liche_orders_model->sum('total_price', ['o_id'=>$row['o_id'],'status'=>1,'pay_price <>'=>0]);
$info['pay_price'] = $sum['total_price'] ? $sum['total_price'] : 0;
diff --git a/admin/views/items/cost/get.php b/admin/views/items/cost/get.php
index 1bcb1c40..01f7db3e 100644
--- a/admin/views/items/cost/get.php
+++ b/admin/views/items/cost/get.php
@@ -155,7 +155,12 @@