|
|
@@ -1250,7 +1250,7 @@ class OrderController extends BaseController
|
|
|
|
|
|
$treeData = $post['treeData'] ?? [];
|
|
|
$newTree = [];
|
|
|
- if(!empty($treeData)){
|
|
|
+ if (!empty($treeData)) {
|
|
|
$treeArr = json_decode($treeData, true);
|
|
|
if (!empty($treeArr) && is_array($treeArr)) {
|
|
|
foreach ($treeArr as $treeInfo) {
|
|
|
@@ -2070,6 +2070,9 @@ class OrderController extends BaseController
|
|
|
$staffFinance = $staff->finance ?? 0;
|
|
|
$info['staffFinance'] = $staffFinance;
|
|
|
|
|
|
+ $shopBusiness = $shop->business ?? 0;
|
|
|
+ $info['shopBusiness'] = $shopBusiness;
|
|
|
+
|
|
|
util::success($info);
|
|
|
}
|
|
|
|