hefei 1 год назад
Родитель
Сommit
f44803f654

+ 14 - 5
app/command/PensionTasks.php

@@ -170,7 +170,8 @@ class PensionTasks extends Command
170 170
                         ->where('bill_id', $bill['bill_id'])
171 171
                         ->where('commission_type', 5)
172 172
                         ->update([
173
-                            'is_gzc'          => 1
173
+                            'is_gzc'          => 1,
174
+                            'gzc'             => 1
174 175
                         ]);
175 176
                 }
176 177
             }
@@ -1906,10 +1907,18 @@ class PensionTasks extends Command
1906 1907
             ->toArray();
1907 1908
         if($user_bill_list){
1908 1909
             foreach ($user_bill_list as $user_bill) {
1909
-                Db::name('user')
1910
-                    ->where('uid', $user_bill['uid'])
1911
-                    ->inc('brokerage_price', (float)$user_bill['number'])
1912
-                    ->update();
1910
+                if($user_bill['commission_type'] == 5){
1911
+                    Db::name('user')
1912
+                        ->where('uid', $user_bill['uid'])
1913
+                        ->inc('annuity', (float)$user_bill['number'])
1914
+                        ->update();
1915
+                }else{
1916
+                    Db::name('user')
1917
+                        ->where('uid', $user_bill['uid'])
1918
+                        ->inc('brokerage_price', (float)$user_bill['number'])
1919
+                        ->update();
1920
+                }
1921
+
1913 1922
                 Db::name('user_bill')
1914 1923
                     ->where('bill_id', $user_bill['bill_id'])
1915 1924
                     ->update([

Разница между файлами не показана из-за своего большого размера
+ 90 - 0
app/common/repositories/user/UserRepository.php


+ 37 - 0
app/controller/admin/user/User.php

@@ -810,6 +810,43 @@ class User extends BaseController
810 810
             return app('json')->fail("失败");
811 811
         }
812 812
     }
813
+
814
+    /**
815
+     * 修改用户奖励表单
816
+     * @param $id
817
+     * @return mixed
818
+     * @throws FormBuilderException
819
+     */
820
+    public function changeAwardForm($id)
821
+    {
822
+        if (!$this->repository->exists($id))
823
+            return app('json')->fail('数据不存在');
824
+        return app('json')->success(formToData($this->repository->changeAwardForm($id)));
825
+    }
826
+
827
+
828
+    /**
829
+     * 修改用户奖励
830
+     * @param $id
831
+     * @param UserRepository $repository
832
+     * @return mixed
833
+     */
834
+    public  function  changeAward($id,UserRepository $repository)
835
+    {
836
+        $type = $this->request->param('type');
837
+        $award_type = $this->request->param('award_type');
838
+        $num = $this->request->param('num');
839
+        $mark = $this->request->param('mark','');
840
+        $admin_id = $this->request->param('admin_id');
841
+        if (!$id || !$award_type || !$num){
842
+            return app('json')->fail('参数丢失');
843
+        }
844
+        if($repository->changeAward($id,$type,$award_type,$num,$mark,$admin_id)){
845
+            return app('json')->success("修改成功");
846
+        }else{
847
+            return app('json')->fail("失败");
848
+        }
849
+    }
813 850
     /**
814 851
      * @param $id
815 852
      * @return mixed

+ 3 - 0
route/admin.php

@@ -369,6 +369,9 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
369 369
             //修改用户推广人
370 370
             Route::get('change_pro/form/:id', '/changeProForm')->name('systemUserChangeProForm');
371 371
             Route::post('change_pro/:id', '/changePro')->name('systemUserChangePro');
372
+            //用户奖励变更
373
+            Route::get('change_award/form/:id', '/changeAwardForm')->name('systemUserChangeAwardForm');
374
+            Route::post('change_award/:id', '/changeAward')->name('systemUserChangeAward');
372 375
             //修改用户密码
373 376
             Route::get('change_pass/form/:id', '/changePassForm')->name('systemUserChangePassForm');
374 377
             Route::post('change_pass/:id', '/changePass')->name('systemUserChangePass');