奖励设置调整

app/common/repositories/user/UserAwardRepository.php

@@ -96,8 +96,8 @@ class UserAwardRepository extends BaseRepository
             'name' => '复购金',
             'key' => 'fugou',
             'number_rate' => $brokerage_fugou_rate['fugou_rate']??0,
-            'guquan_rate' => $fugou_guquan_rate??0,
             'lianchuang_rate' => $fugou_lianchuang_rate??0,
+            'guquan_rate' => $fugou_guquan_rate??0,
             'user_groub_1' => $user_group_fugou_rate[0]['rate']??0,
             'user_groub_2' => $user_group_fugou_rate[1]['rate']??0,
             'user_groub_3' => $user_group_fugou_rate[2]['rate']??0,
@@ -120,11 +120,11 @@ class UserAwardRepository extends BaseRepository
      */
     public function form(array $formData = [])
     {
-        $action = Route::buildUrl('configAwardUpdate' , $formData['key'])->build();
+        $action = Route::buildUrl('configAwardUpdate' , $formData)->build();
         return Elm::createForm($action, [
             Elm::number('number_rate', $formData['name'].'占比(%)')->min(0)->size('large'),
-            Elm::number('guquan_rate', '联创占比(%)')->min(0)->size('large'),
-            Elm::number('lianchuang_rate', '股权占比(%)')->min(0)->size('large'),
+            Elm::number('lianchuang_rate', '联创占比(%)')->min(0)->size('large'),
+            Elm::number('guquan_rate', '股权占比(%)')->min(0)->size('large'),
             Elm::number('user_groub_1', '消费者占比(%)')->min(0)->size('large'),
             Elm::number('user_groub_2', '业务员占比(%)')->min(0)->size('large'),
             Elm::number('user_groub_3', '业务经理占比(%)')->min(0)->size('large'),
@@ -163,7 +163,9 @@ class UserAwardRepository extends BaseRepository
             $brokerage_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->value("value");
             $brokerage_fugou_rate = json_decode($brokerage_fugou_rate, true);
             $brokerage_fugou_rate['brokerage_rate'] = $data['number_rate'];
-            Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->where('mer_id', 0)->update(json_encode($brokerage_fugou_rate));
+            Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->where('mer_id', 0)->update([
+                'value' => json_encode($brokerage_fugou_rate)
+            ]);
 
             //修改佣金等级分成比例
             $user_group_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->value("value");
@@ -175,12 +177,12 @@ class UserAwardRepository extends BaseRepository
             $user_group_rate[4]['rate'] = $data['user_groub_5'];
             $user_group_rate[5]['rate'] = $data['user_groub_6'];
             $user_group_rate[6]['rate'] = $data['user_groub_7'];
-            Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->where('mer_id', 0)->update(json_encode($user_group_rate));
+            Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->where('mer_id', 0)->update(['value' =>json_encode($user_group_rate)]);
 
             //修改佣金股权比例
-            Db::name("system_config_value")->where(["config_key"=>"brokerage_guquan_rate"])->where('mer_id', 0)->update($data['guquan_rate']);
+            Db::name("system_config_value")->where(["config_key"=>"brokerage_guquan_rate"])->where('mer_id', 0)->update(['value' =>$data['guquan_rate']]);
             //修改佣金联创比例
-            Db::name("system_config_value")->where(["config_key"=>"brokerage_lianchuang_rate"])->where('mer_id', 0)->update($data['lianchuang_rate']);
+            Db::name("system_config_value")->where(["config_key"=>"brokerage_lianchuang_rate"])->where('mer_id', 0)->update(['value' =>$data['lianchuang_rate']]);
         }
 
         if ($key == 'fugou') {
@@ -188,7 +190,9 @@ class UserAwardRepository extends BaseRepository
             $brokerage_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->value("value");
             $brokerage_fugou_rate = json_decode($brokerage_fugou_rate, true);
             $brokerage_fugou_rate['fugou_rate'] = $data['number_rate'];
-            Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->where('mer_id', 0)->update(json_encode($brokerage_fugou_rate));
+            Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->where('mer_id', 0)->update([
+                'value' => json_encode($brokerage_fugou_rate)
+            ]);
             //修改复购金等级分成比例
             $user_group_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->value("value");
             $user_group_fugou_rate = json_decode($user_group_fugou_rate, true);
@@ -199,11 +203,13 @@ class UserAwardRepository extends BaseRepository
             $user_group_fugou_rate[4]['rate'] = $data['user_groub_5'];
             $user_group_fugou_rate[5]['rate'] = $data['user_groub_6'];
             $user_group_fugou_rate[6]['rate'] = $data['user_groub_7'];
-            Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->where('mer_id', 0)->update(json_encode($user_group_fugou_rate));
+            Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->where('mer_id', 0)->update([
+                'value' => json_encode($user_group_fugou_rate)
+            ]);
             //修改复购金股权比例
-            Db::name("system_config_value")->where(["config_key"=>"fugou_guquan_rate"])->where('mer_id', 0)->update($data['guquan_rate']);
+            Db::name("system_config_value")->where(["config_key"=>"fugou_guquan_rate"])->where('mer_id', 0)->update(['value' => $data['guquan_rate']]);
             //修改复购金联创比例
-            Db::name("system_config_value")->where(["config_key"=>"fugou_lianchuang_rate"])->where('mer_id', 0)->update($data['lianchuang_rate']);
+            Db::name("system_config_value")->where(["config_key"=>"fugou_lianchuang_rate"])->where('mer_id', 0)->update(['value' => $data['lianchuang_rate']]);
         }
 
         return true;

app/controller/admin/system/config/Award.php

@@ -61,7 +61,6 @@ class Award extends BaseController
     }
 
     /**
-     * @param int $id
      * @return mixed
      * @throws DataNotFoundException
      * @throws DbException

route/admin.php

@@ -97,8 +97,8 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         Route::group('config/award', function () {
             Route::get('lst', '/lst')->name('configAwardLst');
             Route::post('update/:key', '/update')->name('configAwardUpdate');
-            Route::get('update/table/:id', '/updateTable')->name('configAwardUpdateForm');
-        })->prefix('admin.system.config.award');
+            Route::get('update/table', '/updateTable')->name('configAwardUpdateForm');
+        })->prefix('admin.system.config.award');    
 
         Route::group('config/others', function () {
             Route::get('lst', 'ConfigOthers/lst')->name('configOthersSettingLst');