|
|
@@ -215,14 +215,15 @@ class PurchaseController extends BaseController
|
|
|
util::fail('本店已休息,请选择其它门店');
|
|
|
}
|
|
|
|
|
|
- if (isset($ghsShopInfo->pfLevel) && $ghsShopInfo->pfLevel == 1) {
|
|
|
- $notSameCity = PurchaseClass::notSameCity($this->shop, $ghsShopInfo);
|
|
|
- if ($notSameCity == false) {
|
|
|
- util::fail('不是同城买货,不能选择同城配送');
|
|
|
+ if (isset($post['transType']) && $post['transType'] == 4) {
|
|
|
+ if (isset($ghsShopInfo->pfLevel) && $ghsShopInfo->pfLevel == 1) {
|
|
|
+ $notSameCity = PurchaseClass::notSameCity($this->shop, $ghsShopInfo);
|
|
|
+ if ($notSameCity == false) {
|
|
|
+ util::fail('不是同城买货,不能选择同城配送');
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
if ($book == 1) {
|
|
|
$sendTimeWant = isset($post['sendTimeWant']) && !empty($post['sendTimeWant']) ? $post['sendTimeWant'] : date("Y-m-d");
|
|
|
$future = date("Y-m-d", strtotime('+2 day'));
|