From 8839245e2237b21d4a66e2f01517dcd5852061e5 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 5 Jan 2024 17:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E6=B4=A5=E8=B4=B4=E5=AE=A2=E6=9C=8D=E7=AB=AF=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cultural-space/src/api/IndexController.php   | 16 ++++++++++++++++
 .../src/models/CulturalSpaceAreaCycle.php        |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/plugins/cultural-space/src/api/IndexController.php b/plugins/cultural-space/src/api/IndexController.php
index 205add6f..4274c4cd 100644
--- a/plugins/cultural-space/src/api/IndexController.php
+++ b/plugins/cultural-space/src/api/IndexController.php
@@ -20,6 +20,7 @@ use Yunshop\CulturalSpace\models\ContributionLog;
 use Yunshop\CulturalSpace\models\CulturalFund;
 use Yunshop\CulturalSpace\models\CulturalOrderFundLog;
 use Yunshop\CulturalSpace\models\CulturalSpace;
+use Yunshop\CulturalSpace\models\CulturalSpaceAreaBonus;
 use Yunshop\CulturalSpace\models\CulturalSpaceLegumesWithdrawal;
 use Yunshop\ShareholderDividend\models\ShareholderDividendModel;
 use Yunshop\TeamDividend\admin\models\MemberChild;
@@ -174,6 +175,20 @@ class IndexController extends ApiController{
                     ->paginate(20)
                     ->toArray();
                 break;
+            // 市场津贴
+            case 'area_bonus':
+                $result = CulturalSpaceAreaBonus::uniacid()
+                    ->select([
+                        'id',
+                        'area_amount',
+                        'area_rate',
+                        'get_amount',
+                        'created_at'
+                    ])
+                    ->where('uid',$uid)
+                    ->paginate(20)
+                    ->toArray();
+                break;
         }
 
         return $this->successJson('success',[
@@ -525,6 +540,7 @@ class IndexController extends ApiController{
                     'share_reward'        => CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',1)->sum('yz_member_income.amount'),// 销售受益
                     // 'commission'          => $poundage,// 总手续费
                     // 'withdrawal'          => $amount,// 总提现金额
+                    'area_bonus' => CulturalSpaceAreaBonus::uniacid()->where('uid',$uid)->sum('get_amount'),// 市场津贴
                 ];
                 break;
             // 贡献分享分红
diff --git a/plugins/cultural-space/src/models/CulturalSpaceAreaCycle.php b/plugins/cultural-space/src/models/CulturalSpaceAreaCycle.php
index 4b21f040..4c635d4a 100644
--- a/plugins/cultural-space/src/models/CulturalSpaceAreaCycle.php
+++ b/plugins/cultural-space/src/models/CulturalSpaceAreaCycle.php
@@ -161,6 +161,8 @@ class CulturalSpaceAreaCycle extends BaseModel
                     'area_amount' => $teamPerformance['area_amount'],
                     'area_rate'   => $radio,
                     'get_amount'  => $money,
+                    'created_at'  => time(),
+                    'updated_at'  => time(),
                 ];
             }
         }