Răsfoiți Sursa

activity_name

doge 9 ore în urmă
părinte
comite
80b833e51d

+ 2 - 1
app/Services/Sharing/ShareClaimAuditService.php

@@ -103,7 +103,8 @@ class ShareClaimAuditService
 
     private function claim(object $row): array
     {
-        return ['id' => (int)$row->id, 'user_id' => (int)$row->user_id, 'member_id' => (string)($row->member_id ?? ''),
+        return ['id' => (int)$row->id, 'activity_name' => '分享赚钱',
+            'user_id' => (int)$row->user_id, 'member_id' => (string)($row->member_id ?? ''),
             'account' => (string)($row->account ?? ''), 'nickname' => (string)($row->nickname ?? ''), 'request_id' => (string)$row->request_id,
             'amount' => $this->money($row->amount), 'status' => $row->status,
             'audit_admin_id' => $row->audit_admin_id === null ? null : (int)$row->audit_admin_id,

+ 17 - 0
docs/前端接口/新分享系统/后台领取审核-所属活动.md

@@ -0,0 +1,17 @@
+# 后台领取审核:所属活动
+
+领取审核列表增加「所属活动」一列,直接展示 `activity_name`。
+
+| 接口 | 字段位置 |
+| --- | --- |
+| GET `/admin/shareEarning/claims` | `data.data[].activity_name` |
+| GET `/admin/shareEarning/claims/detail?id=17` | `data.activity_name` |
+| POST `/admin/shareEarning/claims/audit` | 审核结果的 `data.activity_name` |
+
+新增字段示例:
+
+```json
+{"activity_name":"分享赚钱"}
+```
+
+该接口目前均为分享赚钱佣金领取申请。金额、状态、筛选条件和审核操作沿用现有实现。

+ 4 - 0
tests/Integration/ShareAdminManagementTest.php

@@ -433,14 +433,18 @@ class ShareAdminManagementTest extends TestCase
     public function test_admin_controller_envelopes_and_filtered_lists(): void
     {
         $id = $this->pending();
+        $this->assertSame('分享赚钱', $this->claims->list(['status' => 'pending'])['data'][0]['activity_name']);
+        $this->assertSame('分享赚钱', $this->claims->detail($id)['activity_name']);
         $this->assertSame(0, (new ShareEarning())->settings($this->admin)->getData(true)['code']);
         $request = Request::create('/admin/shareEarning/claims/audit', 'POST', ['id' => $id, 'action' => 'approve']);
         $request->user = (object)['id' => 8, 'username' => 'admin'];
         $this->app->instance('request', $request);
         $body = (new SharingManagement())->auditClaim($this->claims)->getData(true);
         $this->assertSame(0, $body['code']); $this->assertSame('approved', $body['data']['status']);
+        $this->assertSame('分享赚钱', $body['data']['activity_name']);
         $list = $this->claims->list(['status' => 'approved', 'account' => 'member7', 'start_date' => '2026-10-24', 'end_date' => '2026-10-24']);
         $this->assertSame(1, $list['total']); $this->assertSame('10.01', $list['data'][0]['amount']);
+        $this->assertSame('分享赚钱', $list['data'][0]['activity_name']);
         $this->assertSame(0, $this->claims->list(['status' => 'pending'])['total']);
     }