Browse Source

fix(Job): bought renew mail notified mark

Incisakura 5 years ago
parent
commit
864d90dc9c
3 changed files with 19 additions and 8 deletions
  1. 12 5
      sql/clean_job.sql
  2. 6 2
      src/Command/Job.php
  3. 1 1
      src/Models/Bought.php

+ 12 - 5
sql/clean_job.sql

@@ -1,5 +1,12 @@
-ALTER TABLE `bought` ADD `is_renewed` BOOLEAN NOT NULL DEFAULT FALSE AFTER `price`;
-ALTER TABLE `ss_node` ADD `online` BOOLEAN NOT NULL DEFAULT FALSE AFTER `mu_only`
-    ,ADD `gfw_block` BOOLEAN NOT NULL DEFAULT FALSE AFTER `online`;
-ALTER TABLE `user` ADD `expired` BOOLEAN NOT NULL DEFAULT FALSE AFTER `telegram_id`
-    ,ADD `traffic_notified` BOOLEAN NULL DEFAULT FALSE AFTER `expired`;
+DELIMITER //
+CREATE PROCEDURE alter_table_procedure()
+BEGIN
+      DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
+    ALTER TABLE `bought` ADD `is_renewed` BOOLEAN NOT NULL DEFAULT FALSE AFTER `price`
+        ,CHANGE `is_renewed` `is_notified` BOOLEAN NOT NULL DEFAULT FALSE;
+    ALTER TABLE `ss_node` ADD `online` BOOLEAN NOT NULL DEFAULT FALSE AFTER `mu_only`
+        ,ADD `gfw_block` BOOLEAN NOT NULL DEFAULT FALSE AFTER `online`;
+    ALTER TABLE `user` ADD `expired` BOOLEAN NOT NULL DEFAULT FALSE AFTER `telegram_id`
+        ,ADD `traffic_notified` BOOLEAN NULL DEFAULT FALSE AFTER `expired`;
+    END //
+DELIMITER ;

+ 6 - 2
src/Command/Job.php

@@ -370,6 +370,8 @@ class Job
                 } catch (Exception $e) {
                     echo $e->getMessage();
                 }
+                $bought->is_notified = true;
+                $bought->save();
                 continue;
             }
             if ($user->money >= $shop->price) {
@@ -399,9 +401,9 @@ class Job
                 } catch (Exception $e) {
                     echo $e->getMessage();
                 }
-                $bought->is_renewed = true;
+                $bought->is_notified = true;
                 $bought->save();
-            } elseif ($bought->is_renewed == false) {
+            } elseif ($bought->is_notified == false) {
                 $subject = Config::get('appName') . '-续费失败';
                 $to = $user->email;
                 $text = '您好,系统为您自动续费商品名:' . $shop->name . ',金额:' . $shop->price . ' 元 时,发现您余额不足,请及时充值。充值后请稍等系统便会自动为您续费。';
@@ -413,6 +415,8 @@ class Job
                 } catch (Exception $e) {
                     echo $e->getMessage();
                 }
+                $bought->is_notified = true;
+                $bought->save();
             }
         }
 

+ 1 - 1
src/Models/Bought.php

@@ -12,7 +12,7 @@ namespace App\Models;
  * @property        int     $renew      Time to renew this bought
  * @property        string  $coupon     Coupon applied to this bought
  * @property        float   $price      Price after coupon applied
- * @property        bool    $is_renewed If this bought is renewed
+ * @property        bool    $is_notified If this bought is notified for renew
  */
 class Bought extends Model
 {