添加：装修 - 添加文创豆价格组件

优化：部分内容 文创中心文字内容 文创中心接口添加等级信息输出(已提交)

app/common/services/ComponentService.php

@@ -20,6 +20,7 @@ class ComponentService
         'U_search',                        //搜索框
         'U_notice',                        //公告
         "U_blank",                        //辅助空白
+        "U_cultural_legumes_price",       //文创豆价格
         "U_line",                        //辅助线
         "U_richtext",                    //富文本
         "U_cube",                        //图片组合

plugins/cultural-space/src/api/IndexController.php

@@ -21,7 +21,10 @@ use Yunshop\CulturalSpace\models\CulturalOrderFundLog;
 use Yunshop\CulturalSpace\models\CulturalSpace;
 use Yunshop\ShareholderDividend\models\ShareholderDividendModel;
 use Yunshop\TeamDividend\admin\models\MemberChild;
+use Yunshop\TeamDividend\models\TeamDividendAgencyModel;
+use Yunshop\TeamDividend\models\TeamDividendLevelModel;
 use Yunshop\TeamDividend\models\TeamDividendModel;
+use Yunshop\TeamDividend\models\Uplog;
 
 class IndexController extends ApiController{
     /**
@@ -38,6 +41,8 @@ class IndexController extends ApiController{
         // 获取当前用户信息
         $user = Member::getMemberById($uid,['uid','nickname','realname','avatar']);
         $data['user'] = $user ? $user->toArray() : [];
+        $data['user']['team_dividend'] = TeamDividendAgencyModel::uniacid()->select(['id','level','cultural_level_id'])->where('uid',$uid)->first();
+        $data['user']['team_dividend']['cultural_level_name'] = TeamDividendLevelModel::uniacid()->where('id',$data['user']['team_dividend']['cultural_level_id'])->value('level_name');
         // 获取可提现金额&团队人数
         $data['income'] = (float)Income::uniacid()->where('member_id', $uid)->where('status', 0)->sum('amount');// 可提现金额(仅计算未提现)
         $data['total_income'] = (float)Income::uniacid()->where('member_id', $uid)->sum('amount');// 累计收入(包括已提现收入)
@@ -180,6 +185,33 @@ class IndexController extends ApiController{
             ->paginate(20)
             ->toArray();
     }
+    /**
+     * Common: 装修组件 - 文创豆价格相关信息获取
+     * Author: wu-hui
+     * Time: 2023/11/25 11:46
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getDiyInfo(){
+        $data = [
+            'price' => '0.00',// 当前文创豆价格
+            'is_qualification' => 0,// 当前用户是否存在进入文创中心的资格
+        ];
+        // 获取当前 文创豆价格
+        $price = (float)CulturalFund::uniacid()->value('current_fee');
+        $data['price'] = sprintf("%.2f",$price * 100);
+        // 判断：用户是否存在资格
+        $uid = \YunShop::app()->getMemberId();
+        if($uid > 0){
+            // 获取全部文创经销商等级
+            $allLvId = TeamDividendLevelModel::uniacid()->where('level_type',1)->pluck('id')->toArray();
+            // 获取等级id
+            $isHas = (int)Uplog::uniacid()->where('uid',$uid)->whereIn('after_level_id',$allLvId)->count();
+            if($isHas > 0) $data['is_qualification'] = 1;
+        }
+
+        return $this->successJson('success',$data);
+    }
+
 
 
     /**

plugins/cultural-space/src/models/CulturalSpace.php

@@ -317,13 +317,13 @@ class CulturalSpace extends BaseModel
      * @return array[]
      */
     public function getStatistics($uid){
-        // 服务收益  经销商 津贴(补贴) 奖励
+        // 服务收益(生态服务)  经销商 津贴(补贴) 奖励
         $serviceIncome = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)->sum('yz_member_income.amount');
         // 获取用户当前经销商等级对应的文创补贴名称
-        $teamDividendLevel = TeamDividendAgencyModel::where('uid',$uid)->value('cultural_level_id');
-        $serviceIncomeTitle = TeamDividendLevelModel::uniacid()->where('id',$teamDividendLevel)->value('cultural_level_name');
+        // $teamDividendLevel = TeamDividendAgencyModel::where('uid',$uid)->value('cultural_level_id');
+        $serviceIncomeTitle = '生态服务';//TeamDividendLevelModel::uniacid()->where('id',$teamDividendLevel)->value('cultural_level_name');
 
-        // 贡献收益  经销商 津贴(补贴)平级奖 奖励
+        // 贡献收益(生态贡献)  经销商 津贴(补贴)平级奖 奖励
         $contributionIncome = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)5)->sum('yz_member_income.amount');
         // 贡献值分红
         $contributionBonus = ContributionBonusLog::getIncomeSum($uid)->sum('yz_member_income.amount');
@@ -344,7 +344,7 @@ class CulturalSpace extends BaseModel
         // $isPartner = 0;
         $list = [
             'service_income'      => ['key_name' => 'service_income','title' => $serviceIncomeTitle ?? '服务收益','num' => $serviceIncome,'sort' => 0],
-            'contribution_income' => ['key_name' => 'contribution_income','title' => '贡献收益','num' => $contributionIncome,'sort' => 1],
+            'contribution_income' => ['key_name' => 'contribution_income','title' => '生态贡献','num' => $contributionIncome,'sort' => 1],
             'contribution_bonus'  => ['key_name' => 'contribution_bonus','title' => '贡献值分红','num' => $contributionBonus,'sort' => 2],
             'legumes'             => ['key_name' => 'legumes','title' => '文创豆','num' => $culturalSpace['voucher_number'],'sort' => 3],
             'legumes_income'      => ['key_name' => 'legumes_income','title' => '文创豆收益','num' => $legumesIncome,'sort' => 4],

plugins/cultural-space/views/index/set.blade.php

@@ -71,7 +71,7 @@
                         </el-form-item>
 
 
-                        <el-form-item label="文豆赠送比例" prop="user_fund_ratio">
+                        <el-form-item label="文创豆赠送比例" prop="user_fund_ratio">
                             <el-input type="number" placeholder="收益比例" v-model.number="set.user_fund_ratio" step="10">
                                 <template slot="append">%</template>
                             </el-input>

plugins/decorate/src/common/Component.php

@@ -17,6 +17,7 @@ class Component extends BaseController
         'U_search',                        //搜索框
         'U_notice',                        //公告
         "U_blank",                        //辅助空白
+        "U_cultural_legumes_price",       //文创豆价格
         "U_line",                        //辅助线
         "U_richtext",                    //富文本
         "U_cube",                        //图片组合