修改：个人中心 经纪人中按钮 由用户必须获得过该等级的权重值才显示修改为只要用户成为过该等级的用户就显示（已提交）

plugins/decorate/src/common/services/component/Button.php

@@ -4,6 +4,7 @@ namespace Yunshop\Decorate\common\services\component;
 
 use app\backend\modules\member\models\Member;
 use Yunshop\CollectionRoom\models\CollectionRoomModel;
+use Yunshop\TeamDividend\models\Uplog;
 use Yunshop\WeightValue\models\WeightValue;
 
 class Button{
@@ -16,8 +17,11 @@ class Button{
 
     // 处理组件数据
     public function index($data = []){
-        foreach($data as &$item){
-            if($item['remote_data']) $item['remote_data']['list'] = $this->handleList($item['remote_data']['list']);
+        foreach($data as $dataKey => &$item){
+            if($item['remote_data']) {
+                $item['remote_data']['list'] = $this->handleList($item['remote_data']['list']);
+                if(empty($item['remote_data']['list'])) unset($data[$dataKey]);
+            }
         }
 
         return $data;
@@ -41,18 +45,14 @@ class Button{
                 $parsedUrlNew = trim(strstr($parsedUrl['fragment'],"?",false),'?');
                 parse_str($parsedUrlNew, $params);
                 if((int)$params['team_level_id'] > 0){
-                    $isHas = (int)WeightValue::uniacid()
-                        ->where('member_id',$uid)
-                        ->where('team_dividend_agency_level_id',$params['team_level_id'])
+                    $isHas = (int)Uplog::uniacid()
+                        ->where('uid',$uid)
+                        ->where('after_level_id',$params['team_level_id'])
                         ->value('id');
                     if($isHas <= 0) unset($list[$handleListIndex]);
                 }
+
             }
-
-
-
-
-
         }
 
 

plugins/team-dividend/src/models/TeamDividendLevelUpgrade.php

@@ -70,6 +70,8 @@ class TeamDividendLevelUpgrade extends BackendModel
             '1030' => 'agent_love', // 会员累计获得{{ LOVE_NAME }}数量达到
             '1031' => 'team_new_order_number', // 团队新订单数量满
             '1032' => 'team_shop_order_amount', // 团队自营订单实付金额满
+            // '1050' => 'one_or_two', // 直推间推 某个等级  满多少人
+
         ];
         // 等级为 2000 + 等级id
         return $ret;

plugins/team-dividend/views/admin/level-set-add.blade.php

@@ -706,6 +706,33 @@
                                         </label>
                                     </div>
 
+                                    {{-- 直推间推 某个等级  满多少人  START --}}
+                                    {{--<div class="input-group row">--}}
+                                    {{--    <label class="radio-inline col-xs-12 col-sm-12">--}}
+                                    {{--        <div class="col-xs-12 col-sm-12" style="padding-left: 0">--}}
+                                    {{--            <input type="checkbox" name="upgrade_type[one_or_two]" value="1" @if ($upgrade_type['one_or_two']) checked @endif>--}}
+                                    {{--            (编号:<a href='JavaScript:'>1050</a>)--}}
+                                    {{--            <br>--}}
+                                    {{--            <span>直推间推</span>--}}
+                                    {{--            <select name='upgrade_value[one_or_two_level_id]'>--}}
+                                    {{--                @foreach($level_list as $level)--}}
+                                    {{--                    <option value='{{$level->id}}' @if($level->id == $upgrade_value['one_or_two_level_id'])selected @endif >--}}
+                                    {{--                        {{$level['level_name']}}--}}
+                                    {{--                    </option>--}}
+                                    {{--                @endforeach--}}
+                                    {{--            </select>--}}
+                                    {{--            <input type="text" name="upgrade_value[one_or_two_people]" value="{{$upgrade_value['one_or_two_people']}}" style="width: 50px">--}}
+                                    {{--            <span>人(不填或0默认为1人)</span>--}}
+                                    {{--        </div>--}}
+                                    {{--    </label>--}}
+                                    {{--</div>--}}
+                                    {{-- 直推间推 某个等级  满多少人   END --}}
+
+
+
+
+
+
                                     <div class="input-group row">
                                         <div class="input-group">
                                             <label class="radio-inline">
@@ -742,7 +769,6 @@
                                                         src="@if(isset($upgrade_data->thumb)) {{tomedia($upgrade_data->thumb) }} @endif"/></span>
                                         </div>
                                     </div>
-
                                     <div class="input-group row">
                                         <div class="input-group">
                                             <label class="radio-inline" >

plugins/weight-value/src/admin/IndexController.php

@@ -139,7 +139,7 @@ class IndexController extends BaseController{
             // ->where('after_level_id',6)
             // ->where('uid','!=',4)
             // ->count(DB::raw('DISTINCT(uid)'));
-
+        // (new \Yunshop\ShareholderDividend\services\TimedTaskService)->handle();
         // debug($hasNum);
         // (new WeightValue())->areaGiveInit(5,Order::find(161));
         debug("调试中...");

plugins/weight-value/src/models/GoodsWeightValue.php

@@ -22,6 +22,7 @@ class GoodsWeightValue extends BaseModel{
         $info->goods_id  = $isTeamDividend ? 0 : $goodsId;// 经销商设置true  goods_id = 0；否则为goodsId
         $info->team_dividend_level_id  = $isTeamDividend ? $goodsId : 0;// 经销商设置true  team_dividend_level_id = goodsId；否则为0
         $info->is_open   = $data['is_open'] ?? 0;// 是否开启购买商品赠送权重值：0=未开启，1=开启
+        $info->is_self_purchase   = $data['is_self_purchase'] ?? 0;// 是否开启自购：0=不开启，1=开启
         // 经纪人
         $info->gift_type = $data['gift_type'] ?? 0;// 赠送方式：0=赠送固定值，1=阶梯值赠送
         $info->lv_type   = $data['lv_type'] ?? 0;// 赠送方式：0=二级，1=三级