shish 4 سال پیش
والد
کامیت
79a7f6d3e0
2فایلهای تغییر یافته به همراه18 افزوده شده و 15 حذف شده
  1. 10 7
      biz-ghs/order/classes/OrderClass.php
  2. 8 8
      biz-hd/order/classes/OrderClass.php

+ 10 - 7
biz-ghs/order/classes/OrderClass.php

@@ -916,6 +916,9 @@ class OrderClass extends BaseClass
             $content .= '送货时间:<BR>';
             $content .= '<B>' . $orderInfo['sendTimeWant'] . '</B><BR>';
         }
+        if (isset($orderInfo['book']) && $orderInfo['book'] == 1) {
+            $content .= '<B>预订单</B><BR>';
+        }
         if (isset($respond['remark']) && !empty($respond['remark'])) {
             $content .= '<BR>';
             $content .= '备注:<BR>';
@@ -960,25 +963,25 @@ class OrderClass extends BaseClass
         }
 
         if (isset($respond['sendCost']) && $respond['sendCost'] > 0) {
-            $content .= '    运费:' . floatval($respond['sendCost']) . '<BR>';
+            $content .= '    运费:¥' . floatval($respond['sendCost']) . '<BR>';
         }
-        $content .= '订单金额:' . floatval($respond['prePrice']). '<BR>';
+        $content .= '订单金额:¥' . floatval($respond['prePrice']) . '<BR>';
         if (isset($respond['discountAmount']) && !empty($respond['discountAmount']) && $respond['discountAmount'] > 0) {
-            $content .= '优惠扣除:-' . floatval($respond['discountAmount']) . '<BR>';
+            $content .= '优惠扣除:-¥' . floatval($respond['discountAmount']) . '<BR>';
         }
 
         if (isset($respond['refundPrice']) && $respond['refundPrice'] > 0) {
-            $content .= '退款金额:' . floatval($respond['refundPrice']) . '<BR>';
+            $content .= '退款金额:¥' . floatval($respond['refundPrice']) . '<BR>';
         }
 
         $content .= '应付金额:' . floatval($respond['realPrice']) . '<BR>';
         if (isset($respond['debt']) && $respond['debt'] == 1) {
-            $content .= '实付金额:0.00<BR>';
+            $content .= '实付金额:¥0<BR>';
         } else {
-            $content .= '实付金额:' . floatval($respond['realPrice']) . '<BR>';
+            $content .= '实付金额:¥' . floatval($respond['realPrice']) . '<BR>';
         }
         if ($debtAmount > 0) {
-            $content .= '累计欠款:' . floatval($debtAmount) . '<BR>';
+            $content .= '累计欠款:¥' . floatval($debtAmount) . '<BR>';
         }
 
         $shopId = $orderInfo['shopId'] ?? 0;

+ 8 - 8
biz-hd/order/classes/OrderClass.php

@@ -499,25 +499,25 @@ class OrderClass extends BaseClass
         }
 
         if (isset($respond['sendCost']) && $respond['sendCost'] > 0) {
-            $content .= '    运费:' . floatval($respond['sendCost']) . '<BR>';
+            $content .= '    运费:¥' . floatval($respond['sendCost']) . '<BR>';
         }
-        $content .= '订单金额:' . floatval($respond['orderPrice']) . '<BR>';
+        $content .= '订单金额:¥' . floatval($respond['orderPrice']) . '<BR>';
         if (isset($respond['discountAmount']) && !empty($respond['discountAmount']) && $respond['discountAmount'] > 0) {
-            $content .= '优惠扣除:-' . floatval($respond['discountAmount']) . '<BR>';
+            $content .= '优惠扣除:-¥' . floatval($respond['discountAmount']) . '<BR>';
         }
 
         if (isset($respond['refundPrice']) && $respond['refundPrice'] > 0) {
-            $content .= '退款金额:' . floatval($respond['refundPrice']) . '<BR>';
+            $content .= '退款金额:¥' . floatval($respond['refundPrice']) . '<BR>';
         }
 
-        $content .= '应付金额:' . floatval($respond['orderPrice']) . '<BR>';
+        $content .= '应付金额:¥' . floatval($respond['orderPrice']) . '<BR>';
         if (isset($respond['debt']) && $respond['debt'] == 1) {
-            $content .= '实付金额:0<BR>';
+            $content .= '实付金额:¥0<BR>';
         } else {
-            $content .= '实付金额:' . floatval($respond['realPrice']) . '<BR>';
+            $content .= '实付金额:¥' . floatval($respond['realPrice']) . '<BR>';
         }
         if ($debtAmount > 0) {
-            $content .= '累计欠款:' . floatval($debtAmount) . '<BR>';
+            $content .= '累计欠款:¥' . floatval($debtAmount) . '<BR>';
         }