巨量广告账户级配置

modules/Callback/Http/Controllers/JuliangAccountController.php

@@ -35,10 +35,10 @@ class JuliangAccountController extends CatchController
             'account_name' => 'required|string|max:64',
             'callback_state' => 'required|integer|in:0,1',
             'protect_num' => 'required|integer|min:0',
-            'callback_default_rate' => 'required|min:0|max:100',
-            'callback_rate_time_config' => 'nullable|array',
-            'callback_min_money' => 'required|min:0',
-            'callback_max_money' => 'required|min:0'
+            'default_rate' => 'required|min:0|max:100',
+            'rate_time_config' => 'nullable|array',
+            'min_money' => 'required|min:0',
+            'max_money' => 'required|min:0'
         ]);
 
         if(DB::table('juliang_account_callback_config')
@@ -46,8 +46,8 @@ class JuliangAccountController extends CatchController
             ->exists()) {
             CommonBusinessException::throwError(Errors::JULIANG_ACCOUNT_EXISTS);
         }
-        if($request->input('callback_rate_time_config') &&
-            !$this->is_time_cross($request->input('callback_rate_time_config'))) {
+        if($request->input('rate_time_config') &&
+            !$this->is_time_cross($request->input('rate_time_config'))) {
             CommonBusinessException::throwError(Errors::CALLBACK_RATE_TIME_RANGE_ERROR);
         }
         $now = date('Y-m-d H:i:s');
@@ -55,12 +55,12 @@ class JuliangAccountController extends CatchController
             ->insert([
                 'adv_account_id' => $request->input('account_id'),
                 'adv_account_name' => $request->input('account_name'),
-                'callback_state' => $request->input('callback_state'),
+                'state' => $request->input('state'),
                 'protect_num' => $request->input('protect_num'),
-                'callback_default_rate' => $request->input('callback_default_rate'),
-                'callback_rate_time_config' => \json_encode($request->input('callback_rate_time_config', [])),
-                'callback_min_money' => $request->input('callback_min_money'),
-                'callback_max_money' => $request->input('callback_max_money'),
+                'default_rate' => $request->input('default_rate'),
+                'rate_time_config' => \json_encode($request->input('rate_time_config', [])),
+                'min_money' => $request->input('min_money'),
+                'max_money' => $request->input('max_money'),
                 'company_uid' => $this->getCompanyUid(),
                 'created_at' => $now,
                 'updated_at' => $now,
@@ -69,11 +69,11 @@ class JuliangAccountController extends CatchController
             ->insert([
                 'company_uid' => $this->getCompanyUid(),
                 'account_id' => $request->input('account_id'),
-                'config_per' => $request->input('callback_default_rate'),
+                'config_per' => $request->input('default_rate'),
                 'created_at' => $now,
                 'updated_at' => $now,
             ]);
-        if($request->input('callback_rate_time_config')) {
+        if($request->input('rate_time_config')) {
             $this->saveTimeConfig($this->getCompanyUid(), $request->input('account_id'), $request);
         }
         return 'ok';
@@ -82,15 +82,15 @@ class JuliangAccountController extends CatchController
     public function updateCallbackConfig(Request $request) {
         $this->validate($request, [
             'ids' => 'required|array',
-            'callback_state' => 'required|integer|in:0,1',
+            'state' => 'required|integer|in:0,1',
             'protect_num' => 'required|integer|min:0',
-            'callback_default_rate' => 'required|min:0|max:100',
-            'callback_rate_time_config' => 'nullable|array',
-            'callback_min_money' => 'required|min:0',
-            'callback_max_money' => 'required|min:0'
+            'default_rate' => 'required|min:0|max:100',
+            'rate_time_config' => 'nullable|array',
+            'min_money' => 'required|min:0',
+            'max_money' => 'required|min:0'
         ]);
         if($request->input('callback_rate_time_config') &&
-            !$this->is_time_cross($request->input('callback_rate_time_config'))) {
+            !$this->is_time_cross($request->input('rate_time_config'))) {
             CommonBusinessException::throwError(Errors::CALLBACK_RATE_TIME_RANGE_ERROR);
         }
         $now = date('Y-m-d H:i:s');
@@ -98,12 +98,12 @@ class JuliangAccountController extends CatchController
             DB::table('juliang_account_callback_config')
                 ->where(['id' => $id, 'company_uid' => $this->getCompanyUid()])
                 ->update([
-                    'callback_state' => $request->input('callback_state'),
+                    'state' => $request->input('state'),
                     'protect_num' => $request->input('protect_num'),
-                    'callback_default_rate' => $request->input('callback_default_rate'),
-                    'callback_rate_time_config' => \json_encode($request->input('callback_rate_time_config', [])),
-                    'callback_min_money' => $request->input('callback_min_money'),
-                    'callback_max_money' => $request->input('callback_max_money'),
+                    'default_rate' => $request->input('default_rate'),
+                    'rate_time_config' => \json_encode($request->input('rate_time_config', [])),
+                    'min_money' => $request->input('min_money'),
+                    'max_money' => $request->input('max_money'),
                     'updated_at' => $now,
                 ]);
         }
@@ -122,7 +122,7 @@ class JuliangAccountController extends CatchController
                     ->insert([
                         'company_uid' => $this->getCompanyUid(),
                         'account_id' => $accountId,
-                        'config_per' => $request->input('callback_default_rate'),
+                        'config_per' => $request->input('default_rate'),
                         'created_at' => $now,
                         'updated_at' => $now,
                     ]);
@@ -175,7 +175,7 @@ class JuliangAccountController extends CatchController
             ->where('is_enable',1)
             ->where('company_uid',$companyUid)
             ->where('account_id',$accountId)->update(['is_enable'=>0]);
-        $time_config = $configInfo['callback_rate_time_config'];
+        $time_config = $configInfo['rate_time_config'];
         if (empty($time_config)) {
             return false;
         }
@@ -187,11 +187,11 @@ class JuliangAccountController extends CatchController
         $temp['company_uid'] = $companyUid;
 
         $temp['account_id'] = $accountId;
-        $temp['other_data']['callback_default_rate'] = $configInfo['callback_default_rate'];
-        $temp['other_data']['callback_min_money'] = $configInfo['callback_min_money'];
-        $temp['other_data']['callback_max_money'] = $configInfo['callback_max_money'];
+        $temp['other_data']['default_rate'] = $configInfo['default_rate'];
+        $temp['other_data']['min_money'] = $configInfo['min_money'];
+        $temp['other_data']['max_money'] = $configInfo['max_money'];
         $temp['other_data']['protect_num'] = $configInfo['protect_num'];
-        $temp['other_data']['callback_state'] = $configInfo['callback_state'];
+        $temp['other_data']['state'] = $configInfo['state'];
         $temp['other_data'] = json_encode($temp['other_data']);
         $temp['next_exec_time'] = date('Y-m-d');
 
@@ -206,7 +206,7 @@ class JuliangAccountController extends CatchController
             $data[] = $temp;
             //结束后 百分比改为默认的
             $temp['config_time'] = $end_time;
-            $temp['config_per'] = $configInfo['callback_default_rate'];
+            $temp['config_per'] = $configInfo['default_rate'];
             $data[] = $temp;
         }
         //插入设置最新的时间段百分比

tests/Callback/Http/Controllers/JuliangAccountControllerTest.php

@@ -16,15 +16,15 @@ class JuliangAccountControllerTest extends UsedTestCase
         ])->json('post','http://localhost/api/callback/juliangAccount/addAccount', [
             'account_id' => 1234568,
             'account_name' => 'jkljlkj',
-            'callback_state' => 1,
+            'state' => 1,
             'protect_num' => 3,
-            'callback_default_rate' => 50,
-            'callback_rate_time_config' => [
+            'default_rate' => 50,
+            'rate_time_config' => [
                 ['start_time' => '00:35', 'end_time' => '12:34', 'config_per' => 20],
                 ['start_time' => '13:39', 'end_time' => '19:34', 'config_per' => 30],
             ],
-            'callback_min_money' => 20,
-            'callback_max_money' => 50,
+            'min_money' => 20,
+            'max_money' => 50,
         ]);
 
         $res->dump();
@@ -35,15 +35,15 @@ class JuliangAccountControllerTest extends UsedTestCase
             'Authorization' => 'Bearer '. $this->token,
         ])->json('post','http://localhost/api/callback/juliangAccount/updateCallbackConfig', [
             'ids' => [4],
-            'callback_state' => 0,
+            'state' => 0,
             'protect_num' => 3,
-            'callback_default_rate' => 44,
-            'callback_rate_time_config' => [
+            'default_rate' => 44,
+            'rate_time_config' => [
                 ['start_time' => '15:00', 'end_time' => '15:10', 'config_per' => 40],
                 ['start_time' => '15:20', 'end_time' => '15:30', 'config_per' => 56],
             ],
-            'callback_min_money' => 40,
-            'callback_max_money' => 60,
+            'min_money' => 40,
+            'max_money' => 60,
         ]);
         $res->dump();
     }