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

data/config/xyz/refill.ini.php

@@ -77,20 +77,20 @@ $saihu_oil = ['name' => 'saihu', 'store_id' => 15,'qualitys' => '1',
 #官方中石油通道
 $gftd_oil = ['name' => 'gftd', 'store_id' => 19,'qualitys' => '1',
     'amount' => [
-        100 => [['goods_id' => 6339, 'price' => 95, 'quality' => 1, 'card_type' => 'petrochina']],
-        200 => [['goods_id' => 6340, 'price' => 190, 'quality' => 1, 'card_type' => 'petrochina']],
-        500 => [['goods_id' => 6341, 'price' => 475, 'quality' => 1, 'card_type' => 'petrochina']],
-        1000 => [['goods_id' => 6342, 'price' => 950, 'quality' => 1, 'card_type' => 'petrochina']]
+        100 => [['goods_id' => 6339, 'price' => 96, 'quality' => 1, 'card_type' => 'petrochina']],
+        200 => [['goods_id' => 6340, 'price' => 192, 'quality' => 1, 'card_type' => 'petrochina']],
+        500 => [['goods_id' => 6341, 'price' => 480, 'quality' => 1, 'card_type' => 'petrochina']],
+        1000 => [['goods_id' => 6342, 'price' => 960, 'quality' => 1, 'card_type' => 'petrochina']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
 #官方中石化通道
 $gftdsinop_oil = ['name' => 'gftdsinop', 'store_id' => 20,'qualitys' => '1',
     'amount' => [
-        100 => [['goods_id' => 6343, 'price' => 95, 'quality' => 1, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6344, 'price' => 190, 'quality' => 1, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6345, 'price' => 475, 'quality' => 1, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6346, 'price' => 950, 'quality' => 1, 'card_type' => 'sinopec']]
+        100 => [['goods_id' => 6343, 'price' => 96, 'quality' => 1, 'card_type' => 'sinopec']],
+        200 => [['goods_id' => 6344, 'price' => 192, 'quality' => 1, 'card_type' => 'sinopec']],
+        500 => [['goods_id' => 6345, 'price' => 480, 'quality' => 1, 'card_type' => 'sinopec']],
+        1000 => [['goods_id' => 6346, 'price' => 960, 'quality' => 1, 'card_type' => 'sinopec']]
     ],
     'period' => [], 'refill_type' => 'api'];
 

helper/refill/RefillBase.php

@@ -445,11 +445,10 @@ class RefillBase
             $refill_order->edit($order_id, ['mch_notify_times' => ['exp', 'mch_notify_times+1']]);
             $times = $refill_info['mch_notify_times'] + 1;
 
-            if ($times > 80) {
+            if ($times > 10) {
                 $refill_order->edit($order_id, ['mch_notify_state' => 2]);
             } else {
-                $N = intval($times / 5);
-                $period = intval(pow(2, $N));
+                $period = intval(pow(2, $times));
                 QueueClient::async_push("NotifyMerchantComplete", ['order_id' => $order_id,'manual' => false], $period);
             }
 

helper/refill/policy/mgroup.php

@@ -117,9 +117,10 @@ class rgroup_ctl
         foreach ($mchitems as $item)
         {
             $mchid = intval($item['mchid']);
-            $ids_text = $item['group_ids'];
 
+            $ids_text = $item['group_ids'];
             if (empty($ids_text)) continue;
+
             $gids = explode(',', $ids_text);
             if (empty($gids)) continue;
 

helper/refill/policy/xyz/policy.php

@@ -60,8 +60,10 @@ class policy extends ProviderManager implements IPolicy
 
         if($hasGroup)
         {
-            $ret = array_intersect($names,$channels);
-            if(!empty($ret)) {
+            $ret = array_intersect($names, $channels);
+            if (empty($ret)) {
+                return [$providers, false];
+            } else {
                 $names = $ret;
             }
         }