diff --git a/src/Controllers/User/PlanController.php b/src/Controllers/User/PlanController.php index f12d5baf4..494ae28ec 100755 --- a/src/Controllers/User/PlanController.php +++ b/src/Controllers/User/PlanController.php @@ -55,7 +55,7 @@ final class PlanController extends BaseController } else if ($oUserPlanRow->status == "expired") { $oUserPlanRow->status = "已过期"; } else if ($oUserPlanRow->status == "cancelled") { - $oUserPlanRow->status = "取消"; + $oUserPlanRow->status = "取消支付"; } } diff --git a/src/Services/Cron.php b/src/Services/Cron.php index e772087bc..8ba496f71 100755 --- a/src/Services/Cron.php +++ b/src/Services/Cron.php @@ -1220,10 +1220,13 @@ final class Cron //// activated转移到expired // $oPlanActivated = PlanActivated::where("user_id", $oPlanExpireQueue->user_id)->first(); // 必然有,没有自然报错,user唯一 - $oPlanActivated = Order::where("user_id", $oPlanExpireQueue->user_id)->where("status", "activated") ->first(); - $oPlanActivated->status = "expired"; - $oPlanActivated->_save(); -// self::plan_activatedToExpired($oPlanActivated); + $oPlanActivated = Order::where("user_id", $oPlanExpireQueue->user_id)->where("status", "activated")->first(); + + if ($oPlanActivated) { + $oPlanActivated->status = "expired"; + $oPlanActivated->_save(); +// self::plan_activatedToExpired($oPlanActivated); + } //// end //// 通知