commit

app/admin/controller/user/UserLevel.php

@@ -38,7 +38,7 @@ class UserLevel extends AuthController
         //$field[]= Form::radio('is_pay','是否需要购买',isset($vipinfo) ? $vipinfo->is_pay : 0)->options([['label'=>'需要','value'=>1],['label'=>'免费','value'=>0]])->col(24);
         $field[] = Form::number('valid_date', '有效时间(天)', isset($vipinfo) ? $vipinfo->valid_date : 0)->min(0)->col(8);
         $field[] = Form::number('grade', '等级', isset($vipinfo) ? $vipinfo->grade : 0)->min(0)->col(8);
-        $field[] = Form::number('discount', '享受折扣', isset($vipinfo) ? $vipinfo->discount : 0)->min(0)->col(8);
+        $field[] = Form::number('discount', '享受折扣', isset($vipinfo) ? $vipinfo->discount : 0)->min(0)->col(0);
         $field[] = Form::frameImageOne('icon', '图标', Url::buildUrl('admin/widget.images/index', array('fodder' => 'icon')), isset($vipinfo) ? $vipinfo->icon : '')->icon('image')->width('100%')->height('500px');
         $field[] = Form::frameImageOne('image', '会员背景', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), isset($vipinfo) ? $vipinfo->image : '')->icon('image')->width('100%')->height('500px');
         $field[] = Form::radio('is_show', '是否显示', isset($vipinfo) ? $vipinfo->is_show : 0)->options([['label' => '显示', 'value' => 1], ['label' => '隐藏', 'value' => 0]])->col(8);

app/admin/model/user/User.php

@@ -1237,21 +1237,16 @@ class User extends BaseModel
     public function getLeader($uId)//获取前端传过来的userid
     {
         $leader = $this->where('uid', $uId)->value('spread_uid');
-        var_dump('1');
-        var_dump($leader);
-        var_dump($uId);
         if (!$leader)
         {
             return null;
         }
         $leaderInfo = $this->where('uid', $leader)->find();
-        var_dump('2');
-        var_dump(!$leaderInfo);
         if (!$leaderInfo)
         {
             return null;
         }
-        if ($leaderInfo['is_captain'])
+        if ($leaderInfo['captain'])
         {
             return $leaderInfo;
         }

app/admin/view/user/user_level/index.php

@@ -199,4 +199,4 @@
         }
     }
 </script>
-{/block}
+{/block}

app/models/store/StoreOrder.php

@@ -789,31 +789,23 @@ class StoreOrder extends BaseModel
 
     public static function sendAward($order){
         $userModel = new \app\admin\model\user\User();
-        var_dump('1');
         $leader = $userModel->getLeader($order['uid']);
-        var_dump('2');
-        var_dump($leader);
         $res = true;
         if($leader){
-            var_dump('3');
-            var_dump(!$leader);
             $price = $order['total_price'];
             //TODO
             $ratio = sys_config('price_ratio');
             $award = bcmul($price, $ratio, 2);
-            var_dump('4');
-            var_dump($ratio);
-            var_dump($award);
-            $spreadUserInfo = User::getUserInfo($order['spread_uid']);
+            $uid = User::getUserInfo($order['uid']);
             //TODO 上级推广员返佣之后的金额
-            $balance = bcadd($spreadUserInfo['spread_uid'], $award, 2);
-            $mark = $order['nickname'] . '成功消费[虚拟产品]' . floatval($order['total_price']) . '元,奖励推广佣金' . floatval($award);
+            $balance = bcadd($leader['brokerage_price'], $award, 2);
+            $mark = $uid['nickname'] . '成功消费[虚拟产品]' . floatval($order['total_price']) . '元,奖励推广佣金' . floatval($award);
             //TODO 添加推广记录
-            $res1 = UserBill::income('获得推广佣金', $leader['spread_uid'], 'now_money', 'brokerage', $award, $order['id'], $balance, $mark);
+            $res1 = UserBill::income('获得推广佣金', $leader['uid'], 'now_money', 'brokerage', $award, $order['id'], $balance, $mark);
             //TODO 添加用户余额
-            $res2 = self::bcInc($order['spread_uid'], 'brokerage_price', $award, 'uid');
+            $res2 = User::bcInc($leader['uid'], 'brokerage_price', $award, 'uid');
             //TODO END;
-            $res = $res1&&$res2;
+            $res = $res1 && $res2;
         }
         return $res;
     }