|
|
@@ -325,6 +325,15 @@ class OrderService extends BaseService
|
|
|
$data['onlinePay'] = dict::getDict('onlinePay', 'not');
|
|
|
}
|
|
|
|
|
|
+ //如果没有设置配送日期和时间,给定默认
|
|
|
+ if (!isset($data['reachDate'])) {
|
|
|
+ $data['reachDate'] = date('Y-m-d');
|
|
|
+ }
|
|
|
+ if (!isset($data['reachPeriod'])) {
|
|
|
+ $data['reachPeriod'] = '20:00';
|
|
|
+ }
|
|
|
+ $data['reachTime'] = strtotime($data['reachPeriod'] . ' ' . $data['reachTime'] . ':00');
|
|
|
+
|
|
|
//保存订单
|
|
|
$returnOrder = OrderClass::addOrder($data);
|
|
|
|
|
|
@@ -384,14 +393,14 @@ class OrderService extends BaseService
|
|
|
$goodsInfoList = $goodsList[$id];
|
|
|
}
|
|
|
$data['list'][$key]['goodsInfoList'] = $goodsInfoList;
|
|
|
- $data['list'][$key]['bookAvatar'] = isset($customList[$customId]['smallAvatarUrl']) ? $customList[$customId]['smallAvatarUrl'] : '';
|
|
|
+ $data['list'][$key]['bookAvatar'] = $customList[$customId]['smallAvatarUrl'] ?? '';
|
|
|
$sjId = $val['sjId'];
|
|
|
- $data['list'][$key]['name'] = isset($merchantList[$sjId]['name']) ? $merchantList[$sjId]['name'] : '';
|
|
|
+ $data['list'][$key]['name'] = $merchantList[$sjId]['name'] ?? '';
|
|
|
$data['list'][$key]['reachTime'] = OrderClass::getReachTime($val);
|
|
|
$requireReachTime = '';
|
|
|
if ($val['reachDate'] != '0000-00-00') {
|
|
|
$reachPeriodId = $val['reachPeriod'];
|
|
|
- $reachPeriod = isset($periodData[$reachPeriodId]) ? $periodData[$reachPeriodId] : '上午';
|
|
|
+ $reachPeriod = $periodData[$reachPeriodId] ?? '上午';
|
|
|
$requireReachTime = date("m-d", strtotime($val['reachDate'])) . ' ' . $reachPeriod;
|
|
|
}
|
|
|
$data['list'][$key]['requireReachTime'] = $requireReachTime;
|