|
|
@@ -356,6 +356,11 @@ class OrderClass extends BaseClass
|
|
|
$adminIds = array_unique(array_filter(array_column($list, 'adminId')));
|
|
|
$adminInfo = AdminClass::getAdminByIds($adminIds, null, 'id');
|
|
|
|
|
|
+
|
|
|
+ $customIds = array_column('customId', $list);
|
|
|
+ $customIds = array_unique(array_filter($customIds));
|
|
|
+ $customInfoList = CustomClass::getByIds($customIds, null, 'id');
|
|
|
+
|
|
|
foreach ($list as $key => $val) {
|
|
|
$adminId = $val['adminId'] ?? 0;
|
|
|
$list[$key]['adminName'] = $adminInfo[$adminId]['name'] ?? '';
|
|
|
@@ -406,6 +411,8 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
|
|
|
|
$sendNum = $val['sendNum'] ?? '';
|
|
|
+ $customId = $val['customId'] ?? '';
|
|
|
+ $debtAmount = $customInfoList[$customId]['debtAmount'] ?? 0.00;
|
|
|
$printData = [
|
|
|
'address' => '集美区乐海路186-4',
|
|
|
'sendCost' => $val['sendCost'] ?? '0.00',
|
|
|
@@ -423,6 +430,7 @@ class OrderClass extends BaseClass
|
|
|
],
|
|
|
'product' => $printProduct,
|
|
|
'sendNum' => date("d") . $sendNum,
|
|
|
+ 'debtAmount' => $debtAmount,
|
|
|
];
|
|
|
$list[$key]['printData'] = json_encode($printData);
|
|
|
}
|