|
|
@@ -255,9 +255,13 @@ class OrderClass extends BaseClass
|
|
|
|
|
|
$sendType = $data['sendType'] ?? 0;
|
|
|
if ($sendType == 1) {
|
|
|
- //到店自取,默认当天23点前,没有用,为了方便查询排序
|
|
|
- $data['reachDate'] = date("Y-m-d");
|
|
|
- $data['reachPeriod'] = '22:00';
|
|
|
+ //到店自取,客户自己下单,不会有到店自取时间,但是如果是花店后台接单,会填到店自取时间,重要!!!!!!!!阿东那边已经出问题了!!!
|
|
|
+ if (empty($data['reachDate'])) {
|
|
|
+ $data['reachDate'] = date("Y-m-d");
|
|
|
+ }
|
|
|
+ if (empty($data['reachPeriod'])) {
|
|
|
+ $data['reachPeriod'] = '22:00';
|
|
|
+ }
|
|
|
} else {
|
|
|
//如果不是到店自取的,则必须要有配送时间,默认当天
|
|
|
$data['reachDate'] = !empty($data['reachDate']) ? $data['reachDate'] : date("Y-m-d");
|