Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

admin/control/merchant.php

@@ -936,7 +936,7 @@ class merchantControl extends SystemControl
         foreach ($store_list as $store) {
             $stores[$store['store_id']] = $store['store_name'];
         }
-        $provider_list = $provider_model->getProviderList($condition, 20);
+        $provider_list = $provider_model->getProviderList($condition, 100);
         foreach ($provider_list as $key => $provider) {
             if (!empty($provider['start_period']) && !empty($provider['end_period'])) {
                 $provider_list[$key]['period'] = $provider['start_period'] . '~' . $provider['end_period'];

helper/refill/api/xyz/afandfs/config.php

@@ -4,8 +4,8 @@ namespace refill\afandfs;
 use mtopcard;
 class config
 {
-    const ORDER_URL = 'http://119.8.102.95/api/receiveOrder';
-    const QUERY_URL = 'http://119.8.102.95/api/queryOrder';
+    const ORDER_URL = 'http://150.107.3.58/api/receiveOrder';
+    const QUERY_URL = 'http://150.107.3.58/api/queryOrder';
 
     const PARTNER_ID = '52';
     const KEY = '8dd29f631f84b11f4ed4c2fbfcfc4057';