|
@@ -1945,6 +1945,7 @@ class OrderClass extends BaseClass
|
|
|
foreach ($itemData as $singleItem) {
|
|
foreach ($itemData as $singleItem) {
|
|
|
$productId = $singleItem['productId'] ?? 0;
|
|
$productId = $singleItem['productId'] ?? 0;
|
|
|
$unitPrice = $singleItem['xhUnitPrice'] ?? 0;
|
|
$unitPrice = $singleItem['xhUnitPrice'] ?? 0;
|
|
|
|
|
+ $unitPrice = floatval($unitPrice);
|
|
|
$xhNum = $singleItem['xhNum'] ?? 0;
|
|
$xhNum = $singleItem['xhNum'] ?? 0;
|
|
|
$refundNum = $singleItem['refundNum'] ?? 0;
|
|
$refundNum = $singleItem['refundNum'] ?? 0;
|
|
|
if (isset($itemList[$productId . '_' . $unitPrice])) {
|
|
if (isset($itemList[$productId . '_' . $unitPrice])) {
|
|
@@ -1958,7 +1959,6 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- print_r($itemList);die;
|
|
|
|
|
$itemList = array_values($itemList);
|
|
$itemList = array_values($itemList);
|
|
|
$beforeDebtPrice = bcsub($debtAmount, $remainDebtPrice, 2);
|
|
$beforeDebtPrice = bcsub($debtAmount, $remainDebtPrice, 2);
|
|
|
$realString = $remainDebtPrice > 0 ? '应付' : '实付';
|
|
$realString = $remainDebtPrice > 0 ? '应付' : '实付';
|
|
@@ -2033,7 +2033,7 @@ XL;
|
|
|
}
|
|
}
|
|
|
$remark = '';
|
|
$remark = '';
|
|
|
if ($refundNum > 0) {
|
|
if ($refundNum > 0) {
|
|
|
- $remark = '退了 ' . $refundNum .' '. $bigUnit;
|
|
|
|
|
|
|
+ $remark = '退了 ' . $refundNum . ' ' . $bigUnit;
|
|
|
}
|
|
}
|
|
|
$tableList .= "<tr>";
|
|
$tableList .= "<tr>";
|
|
|
$tableList .= "<td>{$index}</td>";
|
|
$tableList .= "<td>{$index}</td>";
|
