订单确认检测地址

application/library/Order/OrderConfirmUtil.php

@@ -73,9 +73,6 @@ class OrderConfirmUtil {
         $this->memberId = $memberId;
         $this->member = \DAO\MemberModel::getInstance()->getInfo($this->memberId);
         $this ->address = $this->checkCurrentAddress($currentAddress,$this->memberId);
-        if(!$this->address){
-            \Error\ErrorModel::throwException(\Error\CodeConfigModel::noAddressForOrder);
-        }
         //if($this ->address['addressId'] == )
         $this->postData = json_decode($data['param'],true);
         if(!$this->postData){
@@ -158,6 +155,9 @@ class OrderConfirmUtil {
     }
 
     public function checkOneStoreData($temp){
+        if(!$this->address){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::noAddressForOrder);
+        }
         if(!$temp['storeId']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreIdForOrder);
         }
@@ -194,6 +194,11 @@ class OrderConfirmUtil {
      * @throws \Exception
      */
     public function checkOneStoreDataNew($temp){
+        if($temp['deliveryType']==\Our\ApiConst::deliveryStore){
+            if(!$this->address){
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::noAddressForOrder);
+            }
+        }
         if(!$temp['storeId']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreIdForOrder);
         }