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

crontab/control/minutes.php

@@ -76,7 +76,7 @@ class minutesControl extends BaseCronControl
             $cond['mchid'] = $mchid;
             $cond['inner_status'] = 0;
             $cond['order_state'] = ORDER_STATE_SUCCESS;
-            $cond['refill_order.order_time'] = ['gt', $time];
+            $cond['refill_order.order_time'] = ['ge', $time];
 
             $items = Model('')->table('refill_order,vr_order')->join('inner')
                 ->on('refill_order.order_id=vr_order.order_id')
@@ -95,10 +95,11 @@ class minutesControl extends BaseCronControl
             foreach ($items as $item) {
                 //指定card_type,refill_amount的单数比缓存中设置单数大,设置对应缓存能否下单为false,key为商户ID-卡类型-额度
                 $cache_num = $cache[$card_type[$item['card_type']]][$item['refill_amount']];
+                $can_add = true;
                 if ($cache_num < $item['num']) {
                     $can_add = $cache_num == -1;
                 }
-                $new_caches["{$cache['mchid']}-{$item['card_type']}-{$item['refill_amount']}"] = false;
+                $new_caches["{$cache['mchid']}-{$item['card_type']}-{$item['refill_amount']}"] = $can_add;
             }
         }
         if(!empty($new_caches)) {