|
|
@@ -1558,7 +1558,7 @@ class OrderClass extends BaseClass
|
|
|
|
|
|
$customId = $val['customId'] ?? '';
|
|
|
$balance = $customInfoList[$customId]['balance'] ?? 0.00;
|
|
|
- $debtAmount = $balance<0 ? abs($balance) : 0;
|
|
|
+ $debtAmount = $balance < 0 ? abs($balance) : 0;
|
|
|
|
|
|
//打印数据组合
|
|
|
$printData = self::getPrintData($val, $debtAmount, $showItemData);
|
|
|
@@ -1598,9 +1598,9 @@ class OrderClass extends BaseClass
|
|
|
$lastNum = bcsub($itemNum, $refundNum);
|
|
|
|
|
|
if (!empty($remark)) {
|
|
|
- $show = $name . ' ' . $lastNum . $unitName . "【" . $remark . "】";
|
|
|
+ $show = $lastNum . $unitName . ' ' . $name . "【" . $remark . "】";
|
|
|
} else {
|
|
|
- $show = $name . ' ' . $lastNum . $unitName;
|
|
|
+ $show = $lastNum . $unitName . ' ' . $name;
|
|
|
}
|
|
|
|
|
|
$content .= '<B>' . $show . '</B><BR>';
|
|
|
@@ -1978,7 +1978,7 @@ class OrderClass extends BaseClass
|
|
|
$customId = $orderInfo['customId'] ?? 0;
|
|
|
$c = CustomClass::getById($customId);
|
|
|
$balance = $c['balance'] ?? 0.00;
|
|
|
- $debtAmount = $balance<0 ? abs($balance) : 0;
|
|
|
+ $debtAmount = $balance < 0 ? abs($balance) : 0;
|
|
|
$orderSn = $orderInfo['orderSn'] ?? '';
|
|
|
$shopId = $orderInfo['shopId'] ?? 0;
|
|
|
$shop = ShopClass::getById($shopId, true);
|