|
@@ -1322,13 +1322,15 @@ class OrderController extends BaseController
|
|
|
//A4打印需要用到的数据
|
|
//A4打印需要用到的数据
|
|
|
$customId = $info['customId'] ?? 0;
|
|
$customId = $info['customId'] ?? 0;
|
|
|
$remark = $info['remark'] ?? '';
|
|
$remark = $info['remark'] ?? '';
|
|
|
|
|
+ $sendCost = $info['sendCost'] ?? 0;
|
|
|
|
|
+ $sendNum = $info['sendNum'] ?? '';
|
|
|
$fullAddress = '';
|
|
$fullAddress = '';
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
//老油的要显示地址
|
|
//老油的要显示地址
|
|
|
if ($this->mainId == 20528) {
|
|
if ($this->mainId == 20528) {
|
|
|
$fullAddress = $info['fullAddress'] ?? '';
|
|
$fullAddress = $info['fullAddress'] ?? '';
|
|
|
}
|
|
}
|
|
|
- }else{
|
|
|
|
|
|
|
+ } else {
|
|
|
if ($this->mainId == 644) {
|
|
if ($this->mainId == 644) {
|
|
|
$fullAddress = $info['fullAddress'] ?? '';
|
|
$fullAddress = $info['fullAddress'] ?? '';
|
|
|
}
|
|
}
|
|
@@ -1375,6 +1377,8 @@ class OrderController extends BaseController
|
|
|
'table' => $table,
|
|
'table' => $table,
|
|
|
'remark' => $remark,
|
|
'remark' => $remark,
|
|
|
'fullAddress' => $fullAddress,
|
|
'fullAddress' => $fullAddress,
|
|
|
|
|
+ 'sendNum' => $sendNum,
|
|
|
|
|
+ 'sendCost' => $sendCost,
|
|
|
];
|
|
];
|
|
|
$info['printData'] = $a4Print;
|
|
$info['printData'] = $a4Print;
|
|
|
|
|
|