Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/models/store/StoreOrder.php

@@ -355,8 +355,8 @@ class StoreOrder extends BaseModel
                 $addressInfo['detail'] = '';
             }
 
-            if (!$storeId && !$test && !$free_check) return self::setErrorInfo('请选择下单门店!', true);
-            if (!SystemStore::verificWhere()->find($storeId) && !$test && !$free_check) return self::setErrorInfo('请选择正确的下单门店!', true);
+            if (!$storeId && !$test && !$free_check && !$exchange_id) return self::setErrorInfo('请选择下单门店!', true);
+            if (!SystemStore::verificWhere()->find($storeId) && !$test && !$free_check && !$exchange_id) return self::setErrorInfo('请选择正确的下单门店!', true);
             $cartIds = [];
             $totalNum = 0;
             $gainIntegral = 0;