|
|
@@ -1482,8 +1482,9 @@ class OrderClass extends BaseClass
|
|
|
{
|
|
|
//58mm的机器,一行打印16个汉字,32个字母
|
|
|
$productPrice = $current['price'] ?? '';
|
|
|
+ $unitPrice = $current['unitPrice'] ?? '';
|
|
|
$name = $current['name'] ?? '';
|
|
|
- if (floatval($productPrice) == 0.01) {
|
|
|
+ if (floatval($unitPrice) == 0.01) {
|
|
|
$name = $name . '(送)';
|
|
|
}
|
|
|
$productNum = $current['num'] ?? '';
|
|
|
@@ -1505,7 +1506,11 @@ class OrderClass extends BaseClass
|
|
|
$content .= '(买' . $itemNum . $unitName . ' 退' . $refundNum . $unitName . ')<BR>';
|
|
|
}
|
|
|
if ($showPrice == 1) {
|
|
|
- $content .= $productNum . ' = ' . $productPrice . '元<BR>';
|
|
|
+ if (floatval($unitPrice) == 0.01) {
|
|
|
+ $content .= $productNum . ' = ' . $productPrice . '元(赠送价)<BR>';
|
|
|
+ }else{
|
|
|
+ $content .= $productNum . ' = ' . $productPrice . '元<BR>';
|
|
|
+ }
|
|
|
}
|
|
|
$content .= '--------------------------------<BR>';
|
|
|
return $content;
|
|
|
@@ -2120,6 +2125,7 @@ class OrderClass extends BaseClass
|
|
|
'num' => floatval($bigNum) . $xhUnitName . ' * ' . floatval($bigUnitPrice) . '元',
|
|
|
'count' => floatval($bigNum) . $xhUnitName,
|
|
|
'price' => floatval($bigTotalPrice),
|
|
|
+ 'unitPrice'=>floatval($bigUnitPrice),
|
|
|
'refundNum' => $refundNum,
|
|
|
'unitName' => $xhUnitName,
|
|
|
'itemNum' => $bigNum,
|
|
|
@@ -2133,6 +2139,7 @@ class OrderClass extends BaseClass
|
|
|
'num' => floatval($smallNum) . '支 * ' . floatval($smallUnitPrice) . '元',
|
|
|
'count' => floatval($smallNum) . '支',
|
|
|
'price' => floatval($smallTotalPrice),
|
|
|
+ 'unitPrice'=>floatval($smallUnitPrice),
|
|
|
'refundNum' => $refundNum,
|
|
|
'unitName' => '支',
|
|
|
'itemNum' => $smallNum,
|
|
|
@@ -2145,6 +2152,7 @@ class OrderClass extends BaseClass
|
|
|
'num' => floatval($giveNum) . $xhUnitName . ' * 0元',
|
|
|
'count' => floatval($giveNum) . $xhUnitName,
|
|
|
'price' => 0,
|
|
|
+ 'unitPrice'=>0,
|
|
|
'unitName' => $xhUnitName,
|
|
|
'itemNum' => $giveNum,
|
|
|
'remark' => $remark,
|