|
|
@@ -675,13 +675,8 @@ class OrderClass extends BaseClass
|
|
|
$sjId = $shop->sjId ?? 0;
|
|
|
$sj = SjClass::getById($sjId, true);
|
|
|
$sjName = $sj->name ?? '';
|
|
|
- $currentName = $sjName;
|
|
|
- if (isset($shop->default) == false || $shop->default != 1) {
|
|
|
- $shopName = $shop->shopName ?? '';
|
|
|
- if (!empty($shopName)) {
|
|
|
- $currentName = $currentName . ' ' . $shopName;
|
|
|
- }
|
|
|
- }
|
|
|
+ $shopName = $shop->shopName ?? '';
|
|
|
+ $currentName = $shopName == '首店' ? $sjName : $sjName.' '.$shopName;
|
|
|
|
|
|
$content .= '--------------------------------<BR>';
|
|
|
$content .= '订单日期:' . $order->addTime . '<BR>';
|