|
|
@@ -725,7 +725,6 @@ class ShopController extends BaseController {
|
|
|
$productAmount = Tool::formatAmount($value['REAL_PRICE']);
|
|
|
$taxAmount = Tool::formatAmount($taxAmount);
|
|
|
$totalAmount = Tool::formatAmount($totalAmount);
|
|
|
- $taxRate = sprintf('%.3f', $value['TAX_RATE'] / 100);
|
|
|
// 订单详情
|
|
|
$orderDetails .= <<<EOT
|
|
|
<tr>
|
|
|
@@ -733,7 +732,7 @@ class ShopController extends BaseController {
|
|
|
<td style="text-align: center;">{$value['GOODS_TITLE']}</td>
|
|
|
<td style="text-align: center;">{$productAmount}</td>
|
|
|
<td style="text-align: center;">{$value['BUY_NUMS']}</td>
|
|
|
- <td style="text-align: center;">{$taxRate}</td>
|
|
|
+ <td style="text-align: center;">{$value['TAX_RATE']}%</td>
|
|
|
<td style="text-align: center;">{$taxAmount}</td>
|
|
|
<td style="text-align: center;">{$totalAmount}</td>
|
|
|
</tr>
|
|
|
@@ -972,15 +971,14 @@ ORDER;
|
|
|
$totalTaxAmount += $taxAmount;
|
|
|
$taxAmount = sprintf('%.2f', $taxAmount);
|
|
|
$totalAmount = sprintf('%.2f', $totalAmount);
|
|
|
- $taxRate = sprintf('%.3f', $value['TAX_RATE'] / 100);
|
|
|
// 订单详情
|
|
|
$orderDetails .= <<<EOT
|
|
|
<tr>
|
|
|
<td style="text-align: center;">{$value['SKU_CODE']}</td>
|
|
|
<td style="text-align: center;">{$value['GOODS_TITLE']}</td>
|
|
|
<td style="text-align: center;">{$value['REAL_PRICE']}</td>
|
|
|
- <td style="text-align: center;">{$value['BUY_NUMS']}</td>
|
|
|
- <td style="text-align: center;">{$taxRate}</td>
|
|
|
+ <td style="text-align: center;">{$value['BUY_NUMS']}%</td>
|
|
|
+ <td style="text-align: center;">{$value['TAX_RATE']}%</td>
|
|
|
<td style="text-align: center;">{$taxAmount}</td>
|
|
|
<td style="text-align: center;">{$totalAmount}</td>
|
|
|
</tr>
|
|
|
@@ -1525,7 +1523,6 @@ ORDER;
|
|
|
$totalTaxAmount += $taxAmount;
|
|
|
$taxAmount = sprintf('%.2f', $taxAmount);
|
|
|
$totalAmount = sprintf('%.2f', $totalAmount);
|
|
|
- $taxRate = sprintf('%.3f', $value['TAX_RATE'] / 100);
|
|
|
// 订单详情
|
|
|
$orderDetails .= <<<EOT
|
|
|
<tr>
|
|
|
@@ -1533,7 +1530,7 @@ ORDER;
|
|
|
<td style="text-align: center;">{$value['GOODS_TITLE']}</td>
|
|
|
<td style="text-align: center;">{$value['REAL_PRICE']}</td>
|
|
|
<td style="text-align: center;">{$value['BUY_NUMS']}</td>
|
|
|
- <td style="text-align: center;">{$taxRate}</td>
|
|
|
+ <td style="text-align: center;">{$value['TAX_RATE']}%</td>
|
|
|
<td style="text-align: center;">{$taxAmount}</td>
|
|
|
<td style="text-align: center;">{$totalAmount}</td>
|
|
|
</tr>
|