订单

biz-hd/order/classes/OrderClass.php

@@ -560,12 +560,6 @@ class OrderClass extends BaseClass
         $content .= '--------------------------------<BR>';
 
         $readPeriod = $order->reachPeriod ?? 0;
-        if (isset($order->receiveUserName) && !empty($order->receiveUserName)) {
-            $content .= '<B>' . $order->receiveUserName . '</B><BR>';
-        }
-        if (isset($order->receiveMobile) && !empty($order->receiveMobile)) {
-            $content .= '<B>' . $order->receiveMobile . '</B><BR><BR>';
-        }
         if ($order->sendType == 1) {
             if (isset($order->reachDate) && !empty($order->reachDate) && $order->reachDate != '0000-00-00') {
                 $currentReachDate = date("m-d", strtotime($order->reachDate));
@@ -579,22 +573,34 @@ class OrderClass extends BaseClass
                 $content .= '<B>' . $currentReachDate . ' ' . $readPeriod . '前</B><BR><BR>';
             }
         }
+        if (isset($order->receiveUserName) && !empty($order->receiveUserName)) {
+            $content .= '收花人：<BR>';
+            $content .= '<B>' . $order->receiveUserName . '</B><BR>';
+        }
+        if (isset($order->receiveMobile) && !empty($order->receiveMobile)) {
+            $content .= '<B>' . $order->receiveMobile . '</B><BR><BR>';
+        }
         if (isset($order->fullAddress) && !empty($order->fullAddress)) {
             $content .= '<B>' . $order->fullAddress . '（' . $order->showAddress . '）' . '</B><BR><BR>';
         }
+        if (isset($order->cardInfo) && !empty($order->cardInfo)) {
+            $content .= '<B>贺卡内容：' . $order->cardInfo . '</B><BR><BR>';
+        }
         if ($order->anonymity == 1) {
-            $content .= '<B>匿名派送！！！</B><BR><BR>';
+            $content .= '<B>匿名派送！！</B><BR><BR>';
         } else {
             if (isset($order->bookMobile) && !empty($order->bookMobile)) {
                 $bookName = $order->bookName ?? '';
                 $bookMobile = $order->bookMobile ?? '';
-                $content .= '<B>' . $bookName . '</B><BR>';
-                $content .= '<B>' . $bookMobile . '</B><BR>';
+                $content .= '订花人：<BR>';
+                if (!empty($bookName)) {
+                    $content .= '<B>' . $bookName . '</B><BR>';
+                }
+                if (!empty($bookMobile)) {
+                    $content .= '<B>' . $bookMobile . '</B><BR>';
+                }
             }
         }
-        if (isset($order->cardInfo) && !empty($order->cardInfo)) {
-            $content .= '<B>贺卡内容：' . $order->cardInfo . '</B><BR><BR>';
-        }
         if (isset($respond['remark']) && !empty($respond['remark'])) {
             $content .= '<BR>';
             $content .= '备注：<BR>';