客户端-限制境外邮寄地址下单

app/controller/api/store/order/StoreOrder.php

@@ -208,7 +208,7 @@ class StoreOrder extends BaseController
             // 66529	台湾
             // 68405	澳门
             // 68406	香港
-            if ($mer_id != 496 && $addressId != 0) {
+            if ($product_mer_id != 496 && $addressId != 0) {
                 $address_code_list = Db::name('user_address')->where('uid', $uid)->where('address_id', $addressId)->value('code_list');
                 if ($address_code_list) {
                     $addressList = explode(',', $address_code_list);