dever 3 years ago
parent
commit
67527d8655
2 changed files with 11 additions and 4 deletions
  1. 8 3
      app/mshop/lib/Buy.php
  2. 3 1
      app/mshop/lib/Out.php

+ 8 - 3
app/mshop/lib/Buy.php

@@ -1538,7 +1538,12 @@ class Buy
                 }
             }
             $pdf->br();
-            $pdf->right('共'.$body_total['num'].'件商品,合计金额¥' . $body_total['price'] . '元');
+            if ($type == 2) {
+                $pdf->right('共'.$body_total['num'].'件商品');
+            } else {
+                $pdf->right('共'.$body_total['num'].'件商品,合计金额¥' . $body_total['price'] . '元');
+            }
+            
             $pdf->hr();
         }
 
@@ -1557,9 +1562,9 @@ class Buy
             }
             $pdf->br();
             if ($type == 2) {
-                $pdf->right('共'.$body_total['num'].'件商品');
+                $pdf->right('共'.$refund_body_total['num'].'件商品');
             } else {
-                $pdf->right('共'.$body_total['num'].'件商品,合计金额¥' . $body_total['price'] . '元');
+                $pdf->right('共'.$refund_body_total['num'].'件商品,合计金额¥' . $refund_body_total['price'] . '元');
             }
             
             $pdf->hr();

+ 3 - 1
app/mshop/lib/Out.php

@@ -340,7 +340,7 @@ class Out
                 $v['num'],
             );
             if ($type == 2) {
-                unset($d[1]);
+                unset($d[2]);
             }
             $body[] = $d;
             $price = $v['price']*$v['num'];
@@ -355,8 +355,10 @@ class Out
             $d = array
             (
                 '合计',
+                '-',
                 round($body_total['price'], 2),
                 $body_total['num'],
+
             );
 
             if ($type == 2) {