调整：称号授予、活动完成系统通知

caohui123 · Jun 3, 2020 · 66e4621 · 66e4621
1 parent 4955939
commit 66e4621
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/Console/Commands/GrantHonor.php b/app/Console/Commands/GrantHonor.php
@@ -36,6 +36,9 @@ public function __construct()
         parent::__construct();
     }
 
+    // 初始数据-等级称号
+    protected $honors = ['赤脚', '草鞋', '棉鞋', '布鞋', '板鞋', '高跟鞋', '球鞋', '运动鞋', '跑鞋'];
+
     /**
      * Execute the console command.
      *
@@ -76,10 +79,8 @@ public function handle()
                             ]
                         );
                 System::systemNotice([
-                    'from' => 0, 
-                    'to' => $user->rid, 
-                    'type' => 0, 
-                    'msg' => "你已累计运动 $user->count 次，授予您新的的称号: lv".$hoid
+                    'to' => $user->rid,
+                    'msg' => "你已累计运动 $user->count 次，授予您新的的称号: lv".($hoid-1).' '.$this->honors[$hoid-1]
                 ]);
             }
         }

diff --git a/app/Http/Controllers/RunController.php b/app/Http/Controllers/RunController.php
@@ -50,7 +50,7 @@ private function checkMedals($rid, $distance){
         // 活动成就
         $timeNow = date('Y-m-d H:i:s');
         $theLastestFinished = LinkUAs::join('r_activitys', 'link_u_as.acid', '=', 'r_activitys.acid')
-                ->select('link_u_as.rid', 'link_u_as.acid', 'link_u_as.isfinished', 'r_activitys.distance', 'r_activitys.period', 'r_activitys.meid')
+                ->select('link_u_as.rid', 'link_u_as.acid', 'link_u_as.isfinished', 'r_activitys.title', 'r_activitys.distance', 'r_activitys.period', 'r_activitys.meid')
                 ->where('r_activitys.period', '>', $timeNow)  //有效期内的活动
                 ->where('link_u_as.rid', $rid)  //已报名的活动
                 ->where('link_u_as.isfinished', 0) //未完成的活动
@@ -75,7 +75,7 @@ private function checkMedals($rid, $distance){
                 DB::commit();
                 System::systemNotice([
                     'to' => $theLastestFinished->rid,
-                    'msg' => "你新获得一枚勋章<".$medal->name.">"
+                    'msg' => "恭喜您挑战完成活动《".$theLastestFinished->title."》，获得一枚勋章<".$medal->name.">"
                 ]);
             } catch (\Throwable $th) {
                 DB::rollback();