Merge branch 'master' of /data/git/tiantian2

app/Console/Commands/SyncWeixinRechargeState.php

@@ -46,7 +46,14 @@ class SyncWeixinRechargeState extends Command
         $last_id = cache("last_sync_weixin_recharge_id", 0);
 
         DB::enableQueryLog();
-        $recharges = (new Recharge())->where("id", ">", $last_id)->whereNull("paid_at")->where("payment", "weixin")->whereRaw()->limit($threshold)->get();
+        $recharges = (new Recharge())
+            ->where("id", ">", $last_id)
+            ->whereNull("paid_at")
+            ->where("payment", "weixin")
+            ->whereRaw("UNIX_TIMESTAMP(`created_at`) between " . (time() + $offset_seconds) . " and " . (time() + $due_minutes * 60 + $offset_seconds))
+            ->limit($threshold)
+            ->get();
+        dd($recharges);
         if (!$recharges->count()) {
             cache(['last_sync_weixin_recharge_id' => null], now()->addSeconds(90));
             echo "nothing";