|
@@ -60,7 +60,7 @@ class OrderService extends BaseService
|
|
|
$merchantId = $val['merchantId'];
|
|
$merchantId = $val['merchantId'];
|
|
|
$data['list'][$key]['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
|
|
$data['list'][$key]['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
|
|
|
$data['list'][$key]['reachTime'] = OrderClass::getReachTime($val);
|
|
$data['list'][$key]['reachTime'] = OrderClass::getReachTime($val);
|
|
|
- $requireReachTime = '';
|
|
|
|
|
|
|
+ $requireReachTime = '-';
|
|
|
if ($val['reachDate'] != '0000-00-00') {
|
|
if ($val['reachDate'] != '0000-00-00') {
|
|
|
$reachPeriodId = $val['reachPeriod'];
|
|
$reachPeriodId = $val['reachPeriod'];
|
|
|
$reachPeriod = isset($periodData[$reachPeriodId]) ? $periodData[$reachPeriodId] : '上午';
|
|
$reachPeriod = isset($periodData[$reachPeriodId]) ? $periodData[$reachPeriodId] : '上午';
|