|
@@ -1238,13 +1238,14 @@ class OrderClass extends BaseClass
|
|
|
$smallUnitPrice = $itemVal['smallUnitPrice'] ?? 0;
|
|
$smallUnitPrice = $itemVal['smallUnitPrice'] ?? 0;
|
|
|
$smallNum = $itemVal['smallNum'] ?? 0;
|
|
$smallNum = $itemVal['smallNum'] ?? 0;
|
|
|
$giveNum = $itemVal['giveNum'] ?? 0;
|
|
$giveNum = $itemVal['giveNum'] ?? 0;
|
|
|
|
|
+ $xhUnitName = $itemVal['xhUnitName'] ?? '扎';
|
|
|
|
|
|
|
|
if ($bigNum > 0) {
|
|
if ($bigNum > 0) {
|
|
|
$bigTotalPrice = bcmul($bigUnitPrice, $bigNum, 2);
|
|
$bigTotalPrice = bcmul($bigUnitPrice, $bigNum, 2);
|
|
|
$printProduct[] = [
|
|
$printProduct[] = [
|
|
|
'name' => $itemVal['name'] ?? '',
|
|
'name' => $itemVal['name'] ?? '',
|
|
|
- 'num' => floatval($bigNum) . '扎*' . floatval($bigUnitPrice) . '元',
|
|
|
|
|
- 'count' => floatval($bigNum) . '扎',
|
|
|
|
|
|
|
+ 'num' => floatval($bigNum) . $xhUnitName . '*' . floatval($bigUnitPrice) . '元',
|
|
|
|
|
+ 'count' => floatval($bigNum) . $xhUnitName,
|
|
|
'price' => floatval($bigTotalPrice),
|
|
'price' => floatval($bigTotalPrice),
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
@@ -1260,8 +1261,8 @@ class OrderClass extends BaseClass
|
|
|
if ($giveNum > 0) {
|
|
if ($giveNum > 0) {
|
|
|
$giveList[] = [
|
|
$giveList[] = [
|
|
|
'name' => $itemVal['name'] ?? '',
|
|
'name' => $itemVal['name'] ?? '',
|
|
|
- 'num' => floatval($giveNum) . '扎*0元',
|
|
|
|
|
- 'count' => floatval($giveNum) . '扎',
|
|
|
|
|
|
|
+ 'num' => floatval($giveNum) . $xhUnitName . '*0元',
|
|
|
|
|
+ 'count' => floatval($giveNum) . $xhUnitName,
|
|
|
'price' => 0,
|
|
'price' => 0,
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
