导出订单PDF格式修改

frontendApi/modules/v1/controllers/ShopController.php

@@ -716,7 +716,7 @@ class ShopController extends BaseController {
             $userName = $value['REAL_NAME'];
             $address = $provinceName . $cityName . $countyName . $value['ADDRESS'];
             $mobile = $value['MOBILE'];
-            $orderAt = Date::convert($value['PAY_AT'],'Y-m-d H:i:s');
+            $orderAt = Date::convert($value['CREATED_AT'],'Y-m-d H:i:s');
 
             // 总价
             $totalAmount = $value['BUY_NUMS'] * $value['REAL_PRICE'];
@@ -733,11 +733,11 @@ class ShopController extends BaseController {
                 <tr>
                     <td style="text-align: center;">{$value['SKU_CODE']}</td>
                     <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;">{$value['TAX_RATE']}%</td>
-                    <td style="text-align: center;">{$taxAmount}</td>
-                    <td style="text-align: center;">{$totalAmount}</td> 
+                    <td style="text-align: right;">{$productAmount}</td>
+                    <td style="text-align: right;">{$value['BUY_NUMS']}</td>
+                    <td style="text-align: right;">{$value['TAX_RATE']}%</td>
+                    <td style="text-align: right;">{$taxAmount}</td>
+                    <td style="text-align: right;">{$totalAmount}</td> 
                 </tr>
 EOT;
         }
@@ -827,7 +827,7 @@ ORDER;
                                 {$orderDetails}
                                 <tr>
                                     <td colspan="3">Total</td>
-                                    <td>{$orderNums}</td>
+                                    <td style="text-align: right;">{$orderNums}</td>
                                     <td></td>
                                     <td style="text-align: right;">{$totalTaxAmount}</td>
                                     <td style="text-align: right;">{$orderAmount}</td>
@@ -963,7 +963,7 @@ ORDER;
             $userName = $value['REAL_NAME'];
             $address = $provinceName . $cityName . $countyName . $value['ADDRESS'];
             $mobile = $value['MOBILE'];
-            $orderAt = Date::convert($value['PAY_AT'] ?? $value['CREATED_AT'],'Y-m-d H:i:s');
+            $orderAt = Date::convert($value['CREATED_AT'],'Y-m-d H:i:s');
 
             // 总价
             $totalAmount = $value['BUY_NUMS'] * $value['REAL_PRICE'];
@@ -979,11 +979,11 @@ ORDER;
                 <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;">{$value['TAX_RATE']}%</td>
-                    <td style="text-align: center;">{$taxAmount}</td>
-                    <td style="text-align: center;">{$totalAmount}</td> 
+                    <td style="text-align: right;">{$value['REAL_PRICE']}</td>
+                    <td style="text-align: right;">{$value['BUY_NUMS']}</td>
+                    <td style="text-align: right;">{$value['TAX_RATE']}%</td>
+                    <td style="text-align: right;">{$taxAmount}</td>
+                    <td style="text-align: right;">{$totalAmount}</td> 
                 </tr>
 EOT;
         }
@@ -1060,7 +1060,7 @@ ORDER;
                         <div style="display: block; width: 100%;">
                             {$orderBase}
                             
-                            <table border="1" width="100%" style="padding: 10px 20px; text-align: center;">
+                            <table border="1" width="100%" style="padding: 10px 5px; text-align: center;">
                                 <tr>
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Code</th>
                                     <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
@@ -1073,10 +1073,10 @@ ORDER;
                                 {$orderDetails}
                                 <tr>
                                     <td colspan="3">Total</td>
-                                    <td>{$orderNums}</td>
+                                    <td style="text-align: right;">{$orderNums}</td>
                                     <td></td>
-                                    <td>{$totalTaxAmount}</td>
-                                    <td>{$orderAmount}</td>
+                                    <td style="text-align: right;">{$totalTaxAmount}</td>
+                                    <td style="text-align: right;">{$orderAmount}</td>
                                 </tr>
                             </table>
                         </div>
@@ -1531,11 +1531,11 @@ ORDER;
                 <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;">{$value['TAX_RATE']}%</td>
-                    <td style="text-align: center;">{$taxAmount}</td>
-                    <td style="text-align: center;">{$totalAmount}</td> 
+                    <td style="text-align: right;">{$value['REAL_PRICE']}</td>
+                    <td style="text-align: right;">{$value['BUY_NUMS']}</td>
+                    <td style="text-align: right;">{$value['TAX_RATE']}%</td>
+                    <td style="text-align: right;">{$taxAmount}</td>
+                    <td style="text-align: right;">{$totalAmount}</td> 
                 </tr>
 EOT;
         }
@@ -1615,8 +1615,8 @@ ORDER;
                             <table border="1" width="100%" style="padding: 5px 5px; text-align: center;">
                                 <tr>
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Code</th>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Price</th>
+                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Price</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
                                     <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax Rate</th>
                                     <th width="13%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Tax</th>
@@ -1625,10 +1625,10 @@ ORDER;
                                 {$orderDetails}
                                 <tr>
                                     <td colspan="3">Total</td>
-                                    <td>{$orderNums}</td>
+                                    <td style="text-align: right;">{$orderNums}</td>
                                     <td></td>
-                                    <td>{$totalTaxAmount}</td>
-                                    <td>{$orderAmount}</td>
+                                    <td style="text-align: right;">{$totalTaxAmount}</td>
+                                    <td style="text-align: right;">{$orderAmount}</td>
                                 </tr>
                             </table>
                         </div>