|
@@ -460,14 +460,14 @@ class OrderClass extends BaseClass
|
|
|
if (isset($order->goodsNum) && $order->goodsNum > 1) {
|
|
if (isset($order->goodsNum) && $order->goodsNum > 1) {
|
|
|
$content = '<B>美团 ' . $order->thirdSn . ' (' . $order->goodsNum . '个)</B><BR>';
|
|
$content = '<B>美团 ' . $order->thirdSn . ' (' . $order->goodsNum . '个)</B><BR>';
|
|
|
}
|
|
}
|
|
|
|
|
+ $content .= '--------------------------------<BR>';
|
|
|
|
|
+ $content .= date("Y-m-d", strtotime($order->addTime));
|
|
|
} else {
|
|
} else {
|
|
|
$content = '<B>' . $respond['sendNum'] . ' ' . $fromTypeName . '</B><BR>';
|
|
$content = '<B>' . $respond['sendNum'] . ' ' . $fromTypeName . '</B><BR>';
|
|
|
}
|
|
}
|
|
|
$content .= '--------------------------------<BR>';
|
|
$content .= '--------------------------------<BR>';
|
|
|
|
|
|
|
|
$readPeriod = $order->reachPeriod ?? 0;
|
|
$readPeriod = $order->reachPeriod ?? 0;
|
|
|
- $reachPeriodName = dict::getDict('reachPeriodName');
|
|
|
|
|
- $period = $reachPeriodName[$readPeriod] ?? '上午';
|
|
|
|
|
if (isset($order->receiveUserName) && !empty($order->receiveUserName)) {
|
|
if (isset($order->receiveUserName) && !empty($order->receiveUserName)) {
|
|
|
$content .= '<B>' . $order->receiveUserName . '</B><BR>';
|
|
$content .= '<B>' . $order->receiveUserName . '</B><BR>';
|
|
|
}
|
|
}
|
|
@@ -475,7 +475,14 @@ class OrderClass extends BaseClass
|
|
|
$content .= '<B>' . $order->receiveMobile . '</B><BR><BR>';
|
|
$content .= '<B>' . $order->receiveMobile . '</B><BR><BR>';
|
|
|
}
|
|
}
|
|
|
if (isset($order->reachDate) && !empty($order->reachDate) && $order->reachDate != '0000-00-00') {
|
|
if (isset($order->reachDate) && !empty($order->reachDate) && $order->reachDate != '0000-00-00') {
|
|
|
- $content .= '<B>' . $order->reachDate . ' ' . $period . '</B><BR><BR>';
|
|
|
|
|
|
|
+ $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>';
|
|
|
}
|
|
}
|
|
|
if (isset($order->fullAddress) && !empty($order->fullAddress)) {
|
|
if (isset($order->fullAddress) && !empty($order->fullAddress)) {
|
|
|
$content .= '<B>' . $order->fullAddress . '(' . $order->showAddress . ')' . '</B><BR><BR>';
|
|
$content .= '<B>' . $order->fullAddress . '(' . $order->showAddress . ')' . '</B><BR><BR>';
|