|
|
@@ -544,11 +544,12 @@ class OrderClass extends BaseClass
|
|
|
$bookName = $order->bookName ?? '';
|
|
|
$fromTypeName = $staffName . ' ' . $bookName;
|
|
|
}
|
|
|
-
|
|
|
+ $content = '';
|
|
|
+ $content .= "<CB>【零售】</CB>";
|
|
|
if ($fromType == dict::getDict('fromType', 'mt')) {
|
|
|
- $content = '<B>美团 ' . $order->thirdSn . '</B><BR>';
|
|
|
+ $content .= '<B>美团 ' . $order->thirdSn . '</B><BR>';
|
|
|
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)) . '<BR>';
|
|
|
@@ -676,7 +677,7 @@ class OrderClass extends BaseClass
|
|
|
$sj = SjClass::getById($sjId, true);
|
|
|
$sjName = $sj->name ?? '';
|
|
|
$shopName = $shop->shopName ?? '';
|
|
|
- $currentName = $shopName == '首店' ? $sjName : $sjName.' '.$shopName;
|
|
|
+ $currentName = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
|
|
|
|
|
|
$content .= '--------------------------------<BR>';
|
|
|
$content .= '订单日期:' . $order->addTime . '<BR>';
|