kphcdr 1 year ago
parent
commit
3f2b4657b4

+ 6 - 0
app/Base/Utils.php

@@ -8,4 +8,10 @@ class Utils
     {
         return app()->environment("local", "qa", "webtest");
     }
+
+    //会员ID中不出现4
+    public static function idNo4($id)
+    {
+        return str_replace("4", "o", $id);
+    }
 }

+ 2 - 1
app/Exceptions/Handler.php

@@ -2,6 +2,7 @@
 
 namespace App\Exceptions;
 
+use App\Base\Utils;
 use Guanguans\Notify\Factory;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Support\Arr;
@@ -49,7 +50,7 @@ class Handler extends ExceptionHandler
             return false;
         });
         $this->reportable(function (\Throwable $e) {
-            if (!\App::isLocal()) {
+            if (!Utils::isDev()) {
                 Factory::weWork()
                     ->setToken('c7264726-9a21-4e5c-b0e8-9020a9b4ca62')
                     ->setMessage((new \Guanguans\Notify\Messages\WeWork\TextMessage([

+ 2 - 1
app/Modules/Admin/Services/OrderService.php

@@ -3,6 +3,7 @@
 namespace App\Modules\Admin\Services;
 
 use App\Base\BaseService;
+use App\Base\Utils;
 use App\Models\Order\Order;
 use App\Models\Order\OrderGoods;
 use App\Models\User\User;
@@ -34,7 +35,7 @@ class OrderService extends BaseService
                     "no" => $model->goods->pluck("sn")->implode("\sn"),
                     "goods_name" => $firstGoods->goods->name,
                     "goods_sn" => $firstGoods->sn,
-                    "user_id" => $model->user_id,
+                    "user_id" => Utils::idNo4($model->user_id),
                     "thumb" => $firstGoods->goods->thumb,
                     "email" => $model->user->email,
                     "created_at" => $model->created_at->format("Y-m-d H:i:s"),

+ 2 - 1
app/Modules/Admin/Services/UserService.php

@@ -3,6 +3,7 @@
 namespace App\Modules\Admin\Services;
 
 use App\Base\BaseService;
+use App\Base\Utils;
 use App\Exceptions\ClientException;
 use App\Models\User\User;
 use Illuminate\Database\Eloquent\Builder;
@@ -25,7 +26,7 @@ class UserService extends BaseService
             "page_total" => $p->lastPage(),
             "list" => array_map(function (User $u) {
                 return [
-                    "id" => $u->id,
+                    "id" => Utils::idNo4($u->id),
                     "phone" => $u->phone,
                     "email" => $u->email,
                     "status" => $u->status,