|
|
@@ -478,15 +478,19 @@ class OrderClass extends BaseClass
|
|
|
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') {
|
|
|
- $currentReachDate = date("m-d", strtotime($order->reachDate));
|
|
|
- if ($order->reachDate == date("Y-m-d")) {
|
|
|
- $currentReachDate = '今天';
|
|
|
- }
|
|
|
- if ($order->reachDate == date("Y-m-d", strtotime("+1 day"))) {
|
|
|
- $currentReachDate = '明天';
|
|
|
+ if ($order->sendType == 1) {
|
|
|
+ $content .= '<B>到店自取!!</B><BR><BR>';
|
|
|
+ } else {
|
|
|
+ if (isset($order->reachDate) && !empty($order->reachDate) && $order->reachDate != '0000-00-00') {
|
|
|
+ $currentReachDate = date("m-d", strtotime($order->reachDate));
|
|
|
+ if ($order->reachDate == date("Y-m-d")) {
|
|
|
+ $currentReachDate = '今天';
|
|
|
+ }
|
|
|
+ if ($order->reachDate == date("Y-m-d", strtotime("+1 day"))) {
|
|
|
+ $currentReachDate = '明天';
|
|
|
+ }
|
|
|
+ $content .= '<B>' . $currentReachDate . ' ' . $readPeriod . '前</B><BR><BR>';
|
|
|
}
|
|
|
- $content .= '<B>' . $currentReachDate . ' ' . $readPeriod . '前</B><BR><BR>';
|
|
|
}
|
|
|
if (isset($order->fullAddress) && !empty($order->fullAddress)) {
|
|
|
$content .= '<B>' . $order->fullAddress . '(' . $order->showAddress . ')' . '</B><BR><BR>';
|
|
|
@@ -502,9 +506,6 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if ($order->sendType == 1) {
|
|
|
- $content .= '<B>到店自取!!</B><BR><BR>';
|
|
|
- }
|
|
|
|
|
|
if (isset($respond['remark']) && !empty($respond['remark'])) {
|
|
|
$content .= '<BR>';
|