接口：积分奖励公共方法，个人新开户，球队新开户，球场会员认证，新增粉丝，一杆进洞，后台增加积分设置

app/Admin/Actions/Users/UserCourseForm.php

@@ -5,10 +5,12 @@ namespace App\Admin\Actions\Users;
 use App\Models\Course;
 use App\Models\CourseUser;
 use App\Models\User;
+use App\Models\UserExtra;
 use App\Models\UserIdentify;
 use App\Models\UserMessage;
 use App\Models\UserVipLogModel;
 use App\Models\VipModel;
+use App\Services\Api\UserService;
 use App\Services\TencentImMessage;
 use Dcat\Admin\Contracts\LazyRenderable;
 use Dcat\Admin\Traits\LazyWidget;
@@ -57,7 +59,7 @@ class UserCourseForm extends Form implements LazyRenderable
                 $send_data['msg'] = $content;
                 $im_message->send_msg($send_data);
             }
-
+            UserService::changeIntegral($this->user->id, 4); //赠送积分
             DB::commit();
         } catch (\Exception $exception) {
             DB::rollBack();

app/Admin/Controllers/IntegralSettingController.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\IntegralSetting;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class IntegralSettingController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new IntegralSetting(), function (Grid $grid) {
+            $grid->column('id')->sortable();
+            //$grid->column('keyword');
+            $grid->column('desc')->editable();
+            $grid->column('amount')->editable();
+            $grid->column('status')->switch();
+            $grid->column('updated_at');
+        
+            $grid->disableCreateButton();
+            $grid->disableActions();
+            $grid->disableBatchActions();
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new IntegralSetting(), function (Form $form) {
+            $form->display('id');
+            $form->switch('status');
+
+            $form->footer(function ($footer) {
+                // 去掉`查看`checkbox
+                $footer->disableViewCheck();
+                // 去掉`继续编辑`checkbox
+                $footer->disableEditingCheck();
+                // 去掉`继续创建`checkbox
+                $footer->disableCreatingCheck();
+            });
+        });
+    }
+
+}

app/Http/Controllers/V1/AuthController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\V1;
 
+use App\Models\IntegralSetting;
 use App\Models\Job;
 use App\Models\User;
 use App\Models\UserBlacklistModel;
@@ -192,6 +193,7 @@ class AuthController extends Controller
             DB::rollBack();
             return $this->error($exception->getMessage());
         }
+
         return User::where([$type => $account])->first();
     }
 
@@ -428,6 +430,9 @@ class AuthController extends Controller
         if (!$userExtras->save()) {
             return false;
         }
+
+        UserService::changeIntegral($user_id, 1);  //赠送积分
+
         return true;
     }
 }

app/Http/Controllers/V1/CourseController.php

@@ -5,7 +5,9 @@ namespace App\Http\Controllers\V1;
 use App\Http\Requests\StoreCourse;
 use App\Models\CourseField;
 use App\Models\CourseUser;
+use App\Models\UserExtra;
 use App\Services\Api\CourseService;
+use App\Services\Api\UserService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use PHPUnit\Util\Exception;

app/Http/Controllers/V1/GameController.php

@@ -447,8 +447,12 @@ class GameController extends Controller
     }
 
     //删除此球员
-    public function delPlayer(GameUserRequest $request)
+    public function delPlayer(Request $request)
     {
+        $this->GameService->getOneShotHoleUserIds($request->game_id);
+
+        die;
+
         DB::beginTransaction();
         try {
             $game = Game::query()->find($request->game_id);
@@ -484,19 +488,20 @@ class GameController extends Controller
         return $this->success();
     }
 
-    //结束比赛
+    //结束比赛 一杆进洞的积分赠送需要在结束比赛时
     public function endGame(Request $request)
     {
         DB::beginTransaction();
         try {
-            $game = Game::query()->find($request->game_id);
+            $gameId = $request->game_id;
+            $game = Game::query()->find($gameId);
             if (!$game) {
                 throw new Exception(trans('api.GAME_NOT_EXIST'));
             }
-            if (!$this->GameService->hasAuth($this->user->id, $request->game_id)) {
+            if (!$this->GameService->hasAuth($this->user->id, $gameId)) {
                 throw new Exception(trans('api.USER_NO_AUTH'));
             }
-            $game = GameModel::find($request->game_id);
+            $game = GameModel::find($gameId);
             $game->end_time = Carbon::now();
             if (!$game->save()) {
                 throw new Exception(trans('api.DATA_SAVE_FALSE'));
@@ -511,6 +516,9 @@ class GameController extends Controller
                 Log::error('endGame：' . $exception->getMessage());
                 return $this->error(trans('api.NETWORK_ERROR'));
             }
+            //奖励一杆进洞的球手积分
+            $this->GameService->rewardIntegralOneShot();
+
             DB::commit();
         } catch (\Exception $exception) {
             DB::rollBack();

app/Http/Controllers/V1/TeamController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\V1;
 
 use App\Http\Requests\StoreTeam;
 use App\Models\ChatTeam;
+use App\Models\IntegralSetting;
 use App\Models\Team;
 use App\Models\Team as TeamModel;
 use App\Models\TeamPhoto;
@@ -97,6 +98,7 @@ class TeamController extends Controller
             DB::rollBack();
             return $this->error($exception->getMessage());
         }
+        UserService::changeIntegral($this->user->id, 3);  //赠送积分
 
         return $this->success($groupResult);
     }
@@ -117,10 +119,9 @@ class TeamController extends Controller
 
         if (auth('api')->user()) {
             $team['is_team_user'] = $this->TeamService->isTeamUser($teamId) ? 1 : 0;
-            $team['apply_info'] = $this->TeamService->isUserHadApplyJoin($teamId, $this->user->id);
+            $team['apply_info']  = $this->TeamService->isUserHadApplyJoin($teamId, $this->user->id);
             $team['invite_info'] = $this->TeamService->isUserHadInvitedJoin($teamId, $this->user->id);
         }
-
         $team['actual_member_counts'] = $this->TeamService->getTeamUserCount($teamId);
 
         return $this->success($team);
@@ -591,10 +592,7 @@ class TeamController extends Controller
             $teamPhoto->team_id = $request->team_id;
             $photo_urls = $request->input('photo_urls');
             if (!empty($photo_urls) && is_array($photo_urls)) {
-                $photo_arr = array();
-                foreach ($photo_urls as $k => $v) {
-                    $photo_arr [] = array('url' => $v);
-                }
+                $photo_arr = $photo_urls;
             } else {
                 $photo_arr = [];
             }

app/Models/GameUserScore.php

@@ -9,10 +9,8 @@ class GameUserScore extends Model
 {
     use HasFactory;
 
-    protected  $hidden = [
-        'created_at',
-        'updated_at',
-    ];
+    const CREATED_AT = null;
+    const UPDATED_AT = null;
 
     public function changeUser(){
         return $this->belongsTo(User::class, 'change_user_id', 'id');

app/Models/IntegralSetting.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class IntegralSetting extends BaseModel
+{
+    use HasFactory;
+
+    const CREATED_AT = null;
+}

app/Models/TeamGame.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class TeamGame extends Model
+{
+    use HasFactory;
+
+    const UPDATED_AT = null;
+}

app/Models/UserIntegral.php

@@ -10,6 +10,7 @@ class UserIntegral extends BaseModel
     use HasFactory;
 
     const UPDATED_AT = null;
+    public static $instance;
 
     const TYPE = [
         0 => '未知',

app/Services/Api/GameService.php

@@ -16,8 +16,10 @@ use App\Models\GameFictitiou;
 use App\Models\GameLooker;
 use App\Models\GameType;
 use App\Models\GameUserScore;
+use App\Models\IntegralSetting;
 use App\Models\User;
 use App\Models\GameUser;
+use App\Models\UserExtra;
 use App\Models\UserJoin;
 use App\Models\Game as GameModel;
 use App\Services\TencentImGroupService;
@@ -979,7 +981,7 @@ class GameService
             throw new Exception(trans('api.UNAUTHORIZED_OPERATION'));
         }
         if (!empty($scoreLog) && ($score == $scoreLog['score'])) {
-            throw new Exception(trans('api.UNAUTHORIZED_OPERATION'));
+            return true;
         }
         if ($scoreLog) {
             GameUserScore::where($map)->update(['score' => $score]);
@@ -1500,5 +1502,35 @@ class GameService
         return array_merge(['game_info' => $gameInfo], $best);
     }
 
+    /**
+     * @param $gameId
+     * 比赛结束后, 一杆进洞的球员会得到积分 奖励
+     * 因为比赛的过程中是可以改成绩的
+     */
+    public function rewardIntegralOneShot($gameId)
+    {
+        //本次比赛的真实球员
+        $gameUserIds = (new GameUser())->setTable('gu')->from('game_users as gu')
+            ->join('users as u', 'u.id', '=', 'gu.user_id')
+            ->where('gu.game_id', $gameId)
+            ->whereNull('u.deleted_at')
+            ->where('gu.status', 1)
+            ->whereNull('gu.deleted_at')
+            ->where('gu.type', 1)
+            ->orderBy('gu.id', 'asc')
+            ->pluck('gu.id')
+            ->toArray();
+
+        foreach ($gameUserIds as $gameUserId){
+            $count = GameUserScore::query()->where('game_user_id', $gameUserId)->where('score', 1)->count(); //获取 score=1 的数量
+            if($count){
+                for($i=0; $i<$count; $i++){
+                    $userId = GameUser::find($gameUserId)->user_id;
+                    UserService::changeIntegral($userId, 6); //赠送积分
+                }
+            }
+        }
+    }
+
 
 }

app/Services/Api/TeamService.php

@@ -119,9 +119,6 @@ class TeamService
             $val['for_human_read'] = $timeParse->diffForHumans();
             $val['datetime'] = self::timeFormat($val['time']);
             $val['photo_urls'] = json_decode($val['photo_urls'], true);
-            if (count($val['photo_urls']) > 0) {
-                $val['photo_urls'] = array_column($val['photo_urls'], 'url');
-            }
             unset($val['time']);
             $list[$key] = $val;
         }

app/Services/Api/UserService.php

@@ -5,6 +5,7 @@ namespace App\Services\Api;
 use App\Models\BlackList;
 use App\Models\CourseUser;
 use App\Models\GameUser;
+use App\Models\IntegralSetting;
 use App\Models\TeamUser;
 use App\Models\User;
 use App\Models\UserAddress;
@@ -255,7 +256,7 @@ class UserService
                 UserExtra::query()->where('user_id', $this->user->id)->increment('follow_count');
                 //被关注人 粉丝 加 1
                 UserExtra::query()->where('user_id', $target_id)->increment('fans_count');
-
+                UserService::changeIntegral($target_id, 5);  //赠送积分
                 //给用户添加消息记录
                 $notice = NoticeService::getInstance();
                 $notice->send_msg($target_id, '', 10, $this->user->id, 'api.FOLLOW', 0);
@@ -266,9 +267,11 @@ class UserService
                 if (!$status) {
                     UserExtra::query()->where('user_id', $this->user->id)->decrement('follow_count');
                     UserExtra::query()->where('user_id', $target_id)->decrement('fans_count');
+                    UserService::changeIntegral($target_id, 5, '-');  //扣除积分
                 } else {
                     UserExtra::query()->where('user_id', $this->user->id)->increment('follow_count');
                     UserExtra::query()->where('user_id', $target_id)->increment('fans_count');
+                    UserService::changeIntegral($target_id, 5);  //赠送积分
                     //给用户添加消息记录
                     $notice = NoticeService::getInstance();
                     $notice->send_msg($target_id, '', 10, $this->user->id, 'api.FOLLOW', 0);
@@ -533,20 +536,20 @@ class UserService
         return $data;
     }
 
-    //用户积分变化
-    public function changeIntegral($userId, $amount = 0, $type = 1)
+    //变化用户积分 $add = 1 增加；$add = 0 减少
+    public static function changeIntegral($userId, $type, $add = '+')
     {
         DB::beginTransaction();
         try {
-            if ($type == '+') {
+            $amount = IntegralSetting::find($type)->amount;
+            if ($add == '+') {
                 UserExtra::query()->where('user_id', $userId)->increment('integral', $amount);
             } else {
                 UserExtra::query()->where('user_id', $userId)->decrement('integral', $amount);
+                $amount = 0 - $amount; //变为 负数
             }
-
-            $nowIntegral = UserIntegral::query('user_id', $user_id)->orderByDesc('id')->value('integral');
-
-            $userIntegral = App::make('UserIntegral');
+            $nowIntegral  = UserIntegral::query()->where('user_id', $userId)->orderByDesc('id')->value('after_integral') ?: 0;
+            $userIntegral = new UserIntegral(); //这里不能用单例，否则会出现数记录据漏写
             $userIntegral->user_id = $userId;
             $userIntegral->type = $type;
             $userIntegral->before_integral = $nowIntegral;
@@ -597,15 +600,14 @@ class UserService
             if ($request->is_default == 1) {
                 UserAddress::query()->where('user_id', $userId)->update(['is_default' => 0]);
             }
-            $userAddress->address = $request->adress; //格式如：四川省 成都市 青白江区 凤凰东一路195号
             $userAddress->user_id = $userId;
             $userAddress->name = $request->name;
             $userAddress->mobile = $request->mobile;
+            $userAddress->address = $request->adress; //格式如：四川省 成都市 青白江区 凤凰东一路195号
             $userAddress->save();
 
             DB::commit();
         } catch (Exception $exception) {
-
             DB::rollBack();
             ErrorMsgServive::write($exception, request()->url());
             return false;
@@ -613,4 +615,5 @@ class UserService
 
         return true;
     }
+
 }

dcat_admin_ide_helper.php

@@ -12,6 +12,7 @@ namespace Dcat\Admin {
 
     /**
      * @property Grid\Column|Collection select
+     * @property Grid\Column|Collection width
      * @property Grid\Column|Collection id
      * @property Grid\Column|Collection name
      * @property Grid\Column|Collection type
@@ -80,14 +81,15 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection MemberCount
      * @property Grid\Column|Collection NextMsgSeq
      * @property Grid\Column|Collection course_id
-     * @property Grid\Column|Collection hole_list
+     * @property Grid\Column|Collection before9
+     * @property Grid\Column|Collection after9
+     * @property Grid\Column|Collection course_field_id
      * @property Grid\Column|Collection par
      * @property Grid\Column|Collection difficulty
      * @property Grid\Column|Collection gold_dis
      * @property Grid\Column|Collection blue_dis
      * @property Grid\Column|Collection white_dis
      * @property Grid\Column|Collection red_dis
-     * @property Grid\Column|Collection course_field_id
      * @property Grid\Column|Collection member_name
      * @property Grid\Column|Collection member_no
      * @property Grid\Column|Collection whs
@@ -129,6 +131,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection change_user_id
      * @property Grid\Column|Collection score
      * @property Grid\Column|Collection level
+     * @property Grid\Column|Collection course_fields
      * @property Grid\Column|Collection begin_time
      * @property Grid\Column|Collection end_time
      * @property Grid\Column|Collection game_type_id
@@ -147,21 +150,23 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection goods_id
      * @property Grid\Column|Collection pic_url
      * @property Grid\Column|Collection remark
+     * @property Grid\Column|Collection keyword
+     * @property Grid\Column|Collection amount
      * @property Grid\Column|Collection zh_country
      * @property Grid\Column|Collection en_country
      * @property Grid\Column|Collection prefix
      * @property Grid\Column|Collection area
      * @property Grid\Column|Collection goods_attr_id
      * @property Grid\Column|Collection order_no
+     * @property Grid\Column|Collection total_integral
      * @property Grid\Column|Collection num
-     * @property Grid\Column|Collection express_price
-     * @property Grid\Column|Collection is_send
      * @property Grid\Column|Collection send_time
      * @property Grid\Column|Collection express
      * @property Grid\Column|Collection express_no
      * @property Grid\Column|Collection receiver
      * @property Grid\Column|Collection receiver_mobile
      * @property Grid\Column|Collection receiver_address
+     * @property Grid\Column|Collection reamrk
      * @property Grid\Column|Collection token
      * @property Grid\Column|Collection tokenable_type
      * @property Grid\Column|Collection tokenable_id
@@ -187,6 +192,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection cover_img
      * @property Grid\Column|Collection notice
      * @property Grid\Column|Collection notice_time
+     * @property Grid\Column|Collection is_default
      * @property Grid\Column|Collection black_id
      * @property Grid\Column|Collection likes_count
      * @property Grid\Column|Collection comments_count
@@ -199,6 +205,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection bio
      * @property Grid\Column|Collection birthday
      * @property Grid\Column|Collection action_type
+     * @property Grid\Column|Collection before_integral
+     * @property Grid\Column|Collection after_integral
      * @property Grid\Column|Collection invitor_id
      * @property Grid\Column|Collection matter_id
      * @property Grid\Column|Collection reason
@@ -229,6 +237,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection state
      *
      * @method Grid\Column|Collection select(string $label = null)
+     * @method Grid\Column|Collection width(string $label = null)
      * @method Grid\Column|Collection id(string $label = null)
      * @method Grid\Column|Collection name(string $label = null)
      * @method Grid\Column|Collection type(string $label = null)
@@ -297,14 +306,15 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection MemberCount(string $label = null)
      * @method Grid\Column|Collection NextMsgSeq(string $label = null)
      * @method Grid\Column|Collection course_id(string $label = null)
-     * @method Grid\Column|Collection hole_list(string $label = null)
+     * @method Grid\Column|Collection before9(string $label = null)
+     * @method Grid\Column|Collection after9(string $label = null)
+     * @method Grid\Column|Collection course_field_id(string $label = null)
      * @method Grid\Column|Collection par(string $label = null)
      * @method Grid\Column|Collection difficulty(string $label = null)
      * @method Grid\Column|Collection gold_dis(string $label = null)
      * @method Grid\Column|Collection blue_dis(string $label = null)
      * @method Grid\Column|Collection white_dis(string $label = null)
      * @method Grid\Column|Collection red_dis(string $label = null)
-     * @method Grid\Column|Collection course_field_id(string $label = null)
      * @method Grid\Column|Collection member_name(string $label = null)
      * @method Grid\Column|Collection member_no(string $label = null)
      * @method Grid\Column|Collection whs(string $label = null)
@@ -346,6 +356,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection change_user_id(string $label = null)
      * @method Grid\Column|Collection score(string $label = null)
      * @method Grid\Column|Collection level(string $label = null)
+     * @method Grid\Column|Collection course_fields(string $label = null)
      * @method Grid\Column|Collection begin_time(string $label = null)
      * @method Grid\Column|Collection end_time(string $label = null)
      * @method Grid\Column|Collection game_type_id(string $label = null)
@@ -364,21 +375,23 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection goods_id(string $label = null)
      * @method Grid\Column|Collection pic_url(string $label = null)
      * @method Grid\Column|Collection remark(string $label = null)
+     * @method Grid\Column|Collection keyword(string $label = null)
+     * @method Grid\Column|Collection amount(string $label = null)
      * @method Grid\Column|Collection zh_country(string $label = null)
      * @method Grid\Column|Collection en_country(string $label = null)
      * @method Grid\Column|Collection prefix(string $label = null)
      * @method Grid\Column|Collection area(string $label = null)
      * @method Grid\Column|Collection goods_attr_id(string $label = null)
      * @method Grid\Column|Collection order_no(string $label = null)
+     * @method Grid\Column|Collection total_integral(string $label = null)
      * @method Grid\Column|Collection num(string $label = null)
-     * @method Grid\Column|Collection express_price(string $label = null)
-     * @method Grid\Column|Collection is_send(string $label = null)
      * @method Grid\Column|Collection send_time(string $label = null)
      * @method Grid\Column|Collection express(string $label = null)
      * @method Grid\Column|Collection express_no(string $label = null)
      * @method Grid\Column|Collection receiver(string $label = null)
      * @method Grid\Column|Collection receiver_mobile(string $label = null)
      * @method Grid\Column|Collection receiver_address(string $label = null)
+     * @method Grid\Column|Collection reamrk(string $label = null)
      * @method Grid\Column|Collection token(string $label = null)
      * @method Grid\Column|Collection tokenable_type(string $label = null)
      * @method Grid\Column|Collection tokenable_id(string $label = null)
@@ -404,6 +417,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection cover_img(string $label = null)
      * @method Grid\Column|Collection notice(string $label = null)
      * @method Grid\Column|Collection notice_time(string $label = null)
+     * @method Grid\Column|Collection is_default(string $label = null)
      * @method Grid\Column|Collection black_id(string $label = null)
      * @method Grid\Column|Collection likes_count(string $label = null)
      * @method Grid\Column|Collection comments_count(string $label = null)
@@ -416,6 +430,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection bio(string $label = null)
      * @method Grid\Column|Collection birthday(string $label = null)
      * @method Grid\Column|Collection action_type(string $label = null)
+     * @method Grid\Column|Collection before_integral(string $label = null)
+     * @method Grid\Column|Collection after_integral(string $label = null)
      * @method Grid\Column|Collection invitor_id(string $label = null)
      * @method Grid\Column|Collection matter_id(string $label = null)
      * @method Grid\Column|Collection reason(string $label = null)
@@ -451,6 +467,7 @@ namespace Dcat\Admin {
 
     /**
      * @property Show\Field|Collection select
+     * @property Show\Field|Collection width
      * @property Show\Field|Collection id
      * @property Show\Field|Collection name
      * @property Show\Field|Collection type
@@ -519,14 +536,15 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection MemberCount
      * @property Show\Field|Collection NextMsgSeq
      * @property Show\Field|Collection course_id
-     * @property Show\Field|Collection hole_list
+     * @property Show\Field|Collection before9
+     * @property Show\Field|Collection after9
+     * @property Show\Field|Collection course_field_id
      * @property Show\Field|Collection par
      * @property Show\Field|Collection difficulty
      * @property Show\Field|Collection gold_dis
      * @property Show\Field|Collection blue_dis
      * @property Show\Field|Collection white_dis
      * @property Show\Field|Collection red_dis
-     * @property Show\Field|Collection course_field_id
      * @property Show\Field|Collection member_name
      * @property Show\Field|Collection member_no
      * @property Show\Field|Collection whs
@@ -568,6 +586,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection change_user_id
      * @property Show\Field|Collection score
      * @property Show\Field|Collection level
+     * @property Show\Field|Collection course_fields
      * @property Show\Field|Collection begin_time
      * @property Show\Field|Collection end_time
      * @property Show\Field|Collection game_type_id
@@ -586,21 +605,23 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection goods_id
      * @property Show\Field|Collection pic_url
      * @property Show\Field|Collection remark
+     * @property Show\Field|Collection keyword
+     * @property Show\Field|Collection amount
      * @property Show\Field|Collection zh_country
      * @property Show\Field|Collection en_country
      * @property Show\Field|Collection prefix
      * @property Show\Field|Collection area
      * @property Show\Field|Collection goods_attr_id
      * @property Show\Field|Collection order_no
+     * @property Show\Field|Collection total_integral
      * @property Show\Field|Collection num
-     * @property Show\Field|Collection express_price
-     * @property Show\Field|Collection is_send
      * @property Show\Field|Collection send_time
      * @property Show\Field|Collection express
      * @property Show\Field|Collection express_no
      * @property Show\Field|Collection receiver
      * @property Show\Field|Collection receiver_mobile
      * @property Show\Field|Collection receiver_address
+     * @property Show\Field|Collection reamrk
      * @property Show\Field|Collection token
      * @property Show\Field|Collection tokenable_type
      * @property Show\Field|Collection tokenable_id
@@ -626,6 +647,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection cover_img
      * @property Show\Field|Collection notice
      * @property Show\Field|Collection notice_time
+     * @property Show\Field|Collection is_default
      * @property Show\Field|Collection black_id
      * @property Show\Field|Collection likes_count
      * @property Show\Field|Collection comments_count
@@ -638,6 +660,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection bio
      * @property Show\Field|Collection birthday
      * @property Show\Field|Collection action_type
+     * @property Show\Field|Collection before_integral
+     * @property Show\Field|Collection after_integral
      * @property Show\Field|Collection invitor_id
      * @property Show\Field|Collection matter_id
      * @property Show\Field|Collection reason
@@ -668,6 +692,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection state
      *
      * @method Show\Field|Collection select(string $label = null)
+     * @method Show\Field|Collection width(string $label = null)
      * @method Show\Field|Collection id(string $label = null)
      * @method Show\Field|Collection name(string $label = null)
      * @method Show\Field|Collection type(string $label = null)
@@ -736,14 +761,15 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection MemberCount(string $label = null)
      * @method Show\Field|Collection NextMsgSeq(string $label = null)
      * @method Show\Field|Collection course_id(string $label = null)
-     * @method Show\Field|Collection hole_list(string $label = null)
+     * @method Show\Field|Collection before9(string $label = null)
+     * @method Show\Field|Collection after9(string $label = null)
+     * @method Show\Field|Collection course_field_id(string $label = null)
      * @method Show\Field|Collection par(string $label = null)
      * @method Show\Field|Collection difficulty(string $label = null)
      * @method Show\Field|Collection gold_dis(string $label = null)
      * @method Show\Field|Collection blue_dis(string $label = null)
      * @method Show\Field|Collection white_dis(string $label = null)
      * @method Show\Field|Collection red_dis(string $label = null)
-     * @method Show\Field|Collection course_field_id(string $label = null)
      * @method Show\Field|Collection member_name(string $label = null)
      * @method Show\Field|Collection member_no(string $label = null)
      * @method Show\Field|Collection whs(string $label = null)
@@ -785,6 +811,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection change_user_id(string $label = null)
      * @method Show\Field|Collection score(string $label = null)
      * @method Show\Field|Collection level(string $label = null)
+     * @method Show\Field|Collection course_fields(string $label = null)
      * @method Show\Field|Collection begin_time(string $label = null)
      * @method Show\Field|Collection end_time(string $label = null)
      * @method Show\Field|Collection game_type_id(string $label = null)
@@ -803,21 +830,23 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection goods_id(string $label = null)
      * @method Show\Field|Collection pic_url(string $label = null)
      * @method Show\Field|Collection remark(string $label = null)
+     * @method Show\Field|Collection keyword(string $label = null)
+     * @method Show\Field|Collection amount(string $label = null)
      * @method Show\Field|Collection zh_country(string $label = null)
      * @method Show\Field|Collection en_country(string $label = null)
      * @method Show\Field|Collection prefix(string $label = null)
      * @method Show\Field|Collection area(string $label = null)
      * @method Show\Field|Collection goods_attr_id(string $label = null)
      * @method Show\Field|Collection order_no(string $label = null)
+     * @method Show\Field|Collection total_integral(string $label = null)
      * @method Show\Field|Collection num(string $label = null)
-     * @method Show\Field|Collection express_price(string $label = null)
-     * @method Show\Field|Collection is_send(string $label = null)
      * @method Show\Field|Collection send_time(string $label = null)
      * @method Show\Field|Collection express(string $label = null)
      * @method Show\Field|Collection express_no(string $label = null)
      * @method Show\Field|Collection receiver(string $label = null)
      * @method Show\Field|Collection receiver_mobile(string $label = null)
      * @method Show\Field|Collection receiver_address(string $label = null)
+     * @method Show\Field|Collection reamrk(string $label = null)
      * @method Show\Field|Collection token(string $label = null)
      * @method Show\Field|Collection tokenable_type(string $label = null)
      * @method Show\Field|Collection tokenable_id(string $label = null)
@@ -843,6 +872,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection cover_img(string $label = null)
      * @method Show\Field|Collection notice(string $label = null)
      * @method Show\Field|Collection notice_time(string $label = null)
+     * @method Show\Field|Collection is_default(string $label = null)
      * @method Show\Field|Collection black_id(string $label = null)
      * @method Show\Field|Collection likes_count(string $label = null)
      * @method Show\Field|Collection comments_count(string $label = null)
@@ -855,6 +885,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection bio(string $label = null)
      * @method Show\Field|Collection birthday(string $label = null)
      * @method Show\Field|Collection action_type(string $label = null)
+     * @method Show\Field|Collection before_integral(string $label = null)
+     * @method Show\Field|Collection after_integral(string $label = null)
      * @method Show\Field|Collection invitor_id(string $label = null)
      * @method Show\Field|Collection matter_id(string $label = null)
      * @method Show\Field|Collection reason(string $label = null)

resources/lang/zh/integral-setting.php

@@ -0,0 +1,17 @@
+<?php 
+return [
+    'labels' => [
+        'IntegralSetting' => '积分设置',
+        'integral-setting' => '积分设置',
+    ],
+    'fields' => [
+        'keyword' => '关键字',
+        'desc' => '描述',
+        'amount' => '赠送积分',
+        'status' => '启用？',
+        'updated_at' => '更新时间',
+
+    ],
+    'options' => [
+    ],
+];

resources/lang/zh/menu.php

@@ -44,4 +44,5 @@ return [
     'Order'=>'兑换订单',
 
     'Site_settings'=>'网站设置',
+    'Integral_setting' => '积分设置',
 ];

resources/lang/zh/order.php

@@ -9,7 +9,7 @@ return [
         'goods_id' => '商品ID',
         'goods_attr_id' => '规格',
         'order_no' => '订单号',
-        'integral' => '积分',
+        'total_integral' => '总积分',
         'num' => '数量',
         'express_price' => '运费',
         'is_send' => '发货?',