shish 4 роки тому
батько
коміт
df059b3210
1 змінених файлів з 21 додано та 15 видалено
  1. 21 15
      biz-hd/order/classes/OrderClass.php

+ 21 - 15
biz-hd/order/classes/OrderClass.php

@@ -447,26 +447,32 @@ class OrderClass extends BaseClass
         $respond = self::getPrintData($order, $debtAmount);
         $content = '<B>' . $respond['sendNum'] . ' ' . $fromTypeName . '</B><BR>';
         $content .= '--------------------------------<BR>';
-        if (isset($order->receiveMobile) && !empty($order->receiveMobile)) {
-
-            $readPeriod = $order->reachPeriod ?? 0;
-            $reachPeriodName = dict::getDict('reachPeriodName');
-            $period = $reachPeriodName[$readPeriod] ?? '上午';
 
+        $readPeriod = $order->reachPeriod ?? 0;
+        $reachPeriodName = dict::getDict('reachPeriodName');
+        $period = $reachPeriodName[$readPeriod] ?? '上午';
+        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 (isset($order->reachDate) && !empty($order->reachDate) && $order->reachDate != '0000-00-00') {
             $content .= '<B>' . $order->reachDate . ' ' . $period . '</B><BR><BR>';
+        }
+        if (isset($order->fullAddress) && !empty($order->fullAddress)) {
             $content .= '<B>' . $order->fullAddress . '(' . $order->showAddress . ')' . '</B><BR><BR>';
-
-            if ($order->needCard == 1) {
-                $content .= '<B>需要贺卡</B><BR>';
-            }
-            if (!empty($order->cardInfo)) {
-                $content .= '贺卡内容:' . $order->cardInfo . '<BR><BR>';
-            }
-            if ($order->anonymity == 1) {
-                $content .= '<B>匿名派送!!!</B><BR><BR>';
-            } else {
+        }
+        if ($order->needCard == 1) {
+            $content .= '<B>需要贺卡</B><BR>';
+        }
+        if (isset($order->cardInfo) && !empty($order->cardInfo)) {
+            $content .= '贺卡内容:' . $order->cardInfo . '<BR><BR>';
+        }
+        if ($order->anonymity == 1) {
+            $content .= '<B>匿名派送!!!</B><BR><BR>';
+        } else {
+            if (isset($order->bookMobile) && !empty($order->bookMobile)) {
                 $content .= '订花人电话:' . $order->bookMobile . '<BR><BR>';
             }
         }