|
|
@@ -1059,13 +1059,8 @@ class OrderClass extends BaseClass
|
|
|
$telephone = $shop->telephone ?? '';
|
|
|
$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;
|
|
|
|
|
|
$getInfo = self::getById($orderInfo['id']);
|
|
|
$content .= '订单日期:' . date("Y-m-d H:i", strtotime($getInfo['addTime'])) . '<BR>';
|