Merge branch 'refs/heads/dev-sc-260204'

app/controller/api/shareProsperity/Task.php

@@ -1,7 +1,9 @@
 <?php
 
 namespace app\controller\api\shareProsperity;
+use app\common\enum\CommonEnum;
 use app\common\repositories\shared\SharedProsperityTaskRepository;
+use think\facade\Db;
 
 class Task
 {
@@ -11,8 +13,8 @@ class Task
         $get = app()->request->get();
         /** @var SharedProsperityTaskRepository $repository */
         $repository = app()->make(SharedProsperityTaskRepository::class);
-        $repository->partner($get);
-        return app('json')->success();
+        $data = $repository->partner($get);
+        return app('json')->success($data);
     }
 
     public function thankProfits()
@@ -23,4 +25,47 @@ class Task
         $repository->thank($get);
         return app('json')->success();
     }
+
+    public function groupProfits()
+    {
+        $get = app()->request->get();
+        /** @var SharedProsperityTaskRepository $repository */
+        $repository = app()->make(SharedProsperityTaskRepository::class);
+        $data = $repository->group($get);
+        return app('json')->success($data);
+    }
+
+    public function testProfits()
+    {
+        $bill = [
+            'uid' => 2393,
+            'link_id' => 0,
+            'pm' => 1,
+            'title' => '直推奖',
+            'category' => 'now_money',
+            'type' => 'commission',
+            'number' => 82.8,
+            'balance' => 0,
+            'mark' => '线下消费直推奖补发',
+            'create_time' => date('Y-m-d H:i:s'),
+            'status' => 1,
+            'commission_type' => CommonEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+            'order_sn' => 0,
+            'tripartite' => 0,
+            'type_shop' => 0,
+            'mer_id' => 0,
+            'source' => 0,
+            'order_type' => 1,
+            'is_red_brokerage' => 0,
+            'gzc' => 3,
+            'take_time' => time(),
+            'district_id' => '',
+            'street_id' => '',
+            'month' => '',
+        ];
+
+        $res = Db::name('user_bill')->insert($bill);
+        dd($res);
+
+    }
 }

route/api.php

@@ -1383,6 +1383,9 @@ Route::group('/pages', function () {
 Route::get('share_prosperity_partner', 'api.shareProsperity.Task/partnerProfits');
 // 共富感恩奖
 Route::get('share_prosperity_thank', 'api.shareProsperity.Task/thankProfits');
+// 共富奖
+Route::get('share_prosperity_group', 'api.shareProsperity.Task/groupProfits');
+Route::get('share_prosperity_test', 'api.shareProsperity.Task/testProfits');
 
 // 测试接口
 Route::get('/test', 'api.Test/test');