分销计算等

application/admin/lang/zh-cn/unishop/product.php

@@ -23,10 +23,10 @@ return [
     'Updatetime'     => '更新时间',
     'use_spec'     => '选用规格',
     'Createtime'     => '创建时间',
-    'Market price'     => '市场价',
+    'Market price'     => 'VIP销售价',
     'Sales price'     => '销售价',
     'Lower sales price'     => '最低销售价',
-    'Lower market price'     => '最低市场价',
+    'Lower market price'     => '最低VIP销售价',
     'Real sales'     => '真实销量',
     'Real look'     => '真实浏览量',
     'lower price'     => '最低价',

application/api/controller/Hexiao.php

@@ -226,6 +226,29 @@ class Hexiao extends Api
 
     }
 
+    //我的核销余额日志
+    public function my_intromoney_log(){
+        $type = input('type',0);
+
+        $map = [
+            'user_id' => $this->auth->id,
+        ];
+
+        if($type == 1){
+            $map['change_value'] = ['gt',0];
+        }
+        if($type == 2){
+            $map['change_value'] = ['lt',0];
+        }
+
+        $list = Db::name('user_intromoney_log')
+            ->field('id,log_type,before,change_value,remain,remark,createtime')
+            ->where($map)->order('id desc')->autopage()->select();
+//        $list = $this->list_appen_logtext($list);
+
+        $this->success('success',$list);
+    }
+
     //提现配置
     public function take_cash_config(){
 

application/api/controller/Intro.php

@@ -20,21 +20,68 @@ class Intro extends Api
 
     //首页
     public function index(){
+        $user   = Db::name('user')->field('id,avatar,nickname')->where('id',$this->auth->id)->find();
+        $wallet = Db::name('user_wallet')->field('intro_level')->where('user_id',$this->auth->id)->find();
+
+        //团队总业绩
+
+        $chuju = config('site.intro_chuju_min_money');
+
+        //下级
+        $list = Db::name('user_wallet')->alias('uw')
+            ->field('user.id,user.nickname,user.avatar,uw.intro_level')
+            ->join('user','uw.user_id = user.id','LEFT')
+            ->where('uw.intro_uid',$this->auth->id)          //我邀请的
+            ->where('uw.intro_level','neq','-1')             //入金了
+            ->where('uw.intro_level','elt',$wallet['intro_level'])   //等级比我低
+//            ->where('uw.money','lt',$chuju)   //金额小于500，出局
+            ->select();
+
+        dump($list);
+        $down_uids = array_column($list,'id');
+
+        //下下级
+
+        $list2 = Db::name('user_wallet')->alias('uw')
+            ->field('user.id,user.nickname,user.avatar,uw.intro_level,intro.id as intro_id,intro.intro_level as kkk')
+            ->join('user','uw.user_id = user.id','LEFT')
+            ->join('user_wallet intro','uw.intro_uid = intro.user_id','LEFT')  //加这里，就是防止：下下级当中，虽然都比我低，但是有可能高于自己的上级（也就是我的直推）
+            ->whereIN('uw.intro_uid',$down_uids)  //下下级
+            ->where('uw.intro_level','neq','-1')             //入金了
+            ->where('uw.intro_level','elt',$wallet['intro_level'])   //等级比我低
+            ->where('uw.intro_level <= intro.intro_level')   //加这里，就是防止：下下级当中，虽然都比我低，但是有可能高于自己的上级（也就是我的直推）
+            ->select(false);
+
+        dump($list2);
+        $down_down_uids = array_column($list2,'id');
+
+//        $this->success('success',$list);
+    }
 
-        $wallet = Db::name('user_wallet')->where(['user_id' => $this->auth->id])->find();
 
-    }
 
-    //我邀请的人列表
-    public function myintro_list(){
+    //我的分销余额日志
+    public function my_intromoney_log(){
+        $type = input('type',0);
 
-        $list = Db::name('user')->field('id,nickname,avatar,createtime')->where('intro_uid',$this->auth->id)->autopage()->select();
-        $list = list_domain_image($list,['avatar']);
+        $map = [
+            'user_id' => $this->auth->id,
+        ];
 
-        $this->success('success',$list);
-    }
+        if($type == 1){
+            $map['change_value'] = ['gt',0];
+        }
+        if($type == 2){
+            $map['change_value'] = ['lt',0];
+        }
 
+        $list = Db::name('user_intromoney_log')
+            ->field('id,log_type,before,change_value,remain,remark,createtime')
+            ->where($map)->order('id desc')->autopage()->select();
+//        $list = $this->list_appen_logtext($list);
 
+        $this->success('success',$list);
+    }
 
     //提现配置
     public function take_cash_config(){

application/api/controller/Notify.php

@@ -110,7 +110,7 @@ class Notify extends Api
             }
         }
 
-        //入金
+        //入金升级
         if($orderInfo['order_amount'] >= config('site.intro_rujin_money')){
 
             $user_wallet = Db::name('user_wallet')->field('intro_level,intro_uid')->where('user_id',$user_id)->find();//我的
@@ -139,6 +139,9 @@ class Notify extends Api
 
         }
 
+        //给上级提成
+
+
         //默认提交
         Db::commit();
         return true;

application/api/controller/Userwallet.php

@@ -43,52 +43,6 @@ class Userwallet extends Api
         $this->success('success',$list);
     }
 
-    //我的核销余额日志
-    public function my_hexiaomoney_log(){
-        $type = input('type',0);
-
-        $map = [
-           'user_id' => $this->auth->id,
-        ];
-
-        if($type == 1){
-            $map['change_value'] = ['gt',0];
-        }
-        if($type == 2){
-            $map['change_value'] = ['lt',0];
-        }
-
-        $list = Db::name('user_hexiaomoney_log')
-            ->field('id,log_type,before,change_value,remain,remark,createtime')
-            ->where($map)->order('id desc')->autopage()->select();
-//        $list = $this->list_appen_logtext($list);
-
-        $this->success('success',$list);
-    }
-
-    //我的分销余额日志
-    public function my_intromoney_log(){
-        $type = input('type',0);
-
-        $map = [
-           'user_id' => $this->auth->id,
-        ];
-
-        if($type == 1){
-            $map['change_value'] = ['gt',0];
-        }
-        if($type == 2){
-            $map['change_value'] = ['lt',0];
-        }
-
-        $list = Db::name('user_intromoney_log')
-            ->field('id,log_type,before,change_value,remain,remark,createtime')
-            ->where($map)->order('id desc')->autopage()->select();
-//        $list = $this->list_appen_logtext($list);
-
-        $this->success('success',$list);
-    }
-
 
     //追加log_text
     private function list_appen_logtext($list){