|
@@ -669,8 +669,12 @@ class ForwardService extends BaseService
|
|
|
true
|
|
true
|
|
|
);
|
|
);
|
|
|
$rows = [];
|
|
$rows = [];
|
|
|
|
|
+ $customName = $order->customName ?? '';
|
|
|
foreach ($list ?: [] as $row) {
|
|
foreach ($list ?: [] as $row) {
|
|
|
- $rows[] = self::formatForwardRow($row);
|
|
|
|
|
|
|
+ $item = self::formatForwardRow($row);
|
|
|
|
|
+ // 列表补发凭证需要客户名，沿用原单客户名避免再查
|
|
|
|
|
+ $item['customName'] = $customName;
|
|
|
|
|
+ $rows[] = $item;
|
|
|
}
|
|
}
|
|
|
return ['list' => $rows, 'orderId' => $orderId, 'forwardPrice' => $order->forwardPrice ?? '0.00'];
|
|
return ['list' => $rows, 'orderId' => $orderId, 'forwardPrice' => $order->forwardPrice ?? '0.00'];
|
|
|
}
|
|
}
|
|
@@ -701,6 +705,10 @@ class ForwardService extends BaseService
|
|
|
}
|
|
}
|
|
|
$data = self::formatForwardRow($forward);
|
|
$data = self::formatForwardRow($forward);
|
|
|
$data['items'] = $itemRows;
|
|
$data['items'] = $itemRows;
|
|
|
|
|
+ // 补发退款凭证海报用：客户名 + 当前余额
|
|
|
|
|
+ $custom = CustomClass::getById(intval($forward->customId ?? 0), true);
|
|
|
|
|
+ $data['customName'] = $custom->name ?? '';
|
|
|
|
|
+ $data['customBalance'] = bcadd((string)($custom->balance ?? '0'), '0', 2);
|
|
|
return $data;
|
|
return $data;
|
|
|
}
|
|
}
|
|
|
|
|
|
