Merge branch 'master' into huangfamily

app/common.php

@@ -897,3 +897,21 @@ if (!function_exists("is_json")){
         return true;
     }
 }
+
+
+
+if (!function_exists("roundOptimize")){
+    /**
+     * round公用四舍五入去除
+     * @param $number
+     * @return string
+     */
+    function roundOptimize($amount, $decimals = 2): string
+    {
+        if ($amount > 0) {
+            $factor = pow(10, $decimals);
+            return floor($amount * $factor) / $factor;
+        }
+        return $amount;
+    }
+}

app/common/repositories/finance/FinanceRepository.php

@@ -16,6 +16,7 @@ use app\common\repositories\user\UserRepository;
 use think\Exception;
 use think\facade\Db;
 use think\facade\Request;
+use crmeb\services\SpreadsheetExcelService;
 
 class FinanceRepository extends BaseRepository
 {
@@ -469,6 +470,126 @@ class FinanceRepository extends BaseRepository
         $query2 = clone $query;
         $query3 = clone $query;
         $query4 = clone $query;
+
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] = $this->date_where($query, $where['date'], 'ub.create_time')
+            ->field('ub.bill_id,ub.title,ub.number,ub.mark,ub.take_time,ub.commission_type,u.uid,u.phone,u.nickname,u.user_group,ub.order_sn,ub.take_time,ub.status,ub.create_time')
+            ->order('ub.bill_id', 'desc')
+            ->select();
+
+            if (isset($params['commission_type']) && $params['commission_type'] == 5) {
+                $title = '养老金账单';
+                $arr = [];
+                foreach ($date['list'] as $k=>$item){
+                    switch ($item['status']) {
+                        case '1':
+                            $item['status'] = '有效';
+                            break;
+                        case '-1':
+                            $item['status'] = '已失效';
+                            break;
+                        case '0':
+                            $item['status'] = '待确定';
+                            break;
+                    }
+                    switch ($item['user_group']) {
+                        case '1':
+                            $item['user_group'] = '消费者';
+                            break;
+                        case '2':
+                            $item['user_group'] = '业务员';
+                            break;
+                        case '3':
+                            $item['user_group'] = '业务经理';
+                            break;
+                        case '4':
+                            $item['user_group'] = '初级合伙人';
+                            break;
+                        case '5':
+                            $item['user_group'] = '中级合伙人';
+                            break;
+                        case '6':
+                            $item['user_group'] = '高级合伙人';
+                            break;
+                        case '7':
+                            $item['user_group'] = '董事';
+                            break;
+                    }
+                    $arr[] = array(
+                        $item['bill_id'],
+                        $item['create_time'],
+                        $item['nickname'],
+                        $item['phone'],
+                        $item['user_group'],
+                        $item['number'],
+                        $item['status'],
+                        $item['order_sn'],
+                        $item['mark']
+                    );
+                }
+                return $this->getStatisticsExcel([
+                    'ID','时间','用户昵称','手机号','当前身份','金额','状态','关联订单','说名',
+                ], $arr, $title);
+            } else {
+                $title = '佣金账单';
+                $arr = [];
+                foreach ($date['list'] as $k=>$item){
+                    switch ($item['status']) {
+                        case '1':
+                            $item['status'] = '有效';
+                            break;
+                        case '-1':
+                            $item['status'] = '已失效';
+                            break;
+                        case '0':
+                            $item['status'] = '待确定';
+                            break;
+                    }
+                    switch ($item['user_group']) {
+                        case '1':
+                            $item['user_group'] = '消费者';
+                            break;
+                        case '2':
+                            $item['user_group'] = '业务员';
+                            break;
+                        case '3':
+                            $item['user_group'] = '业务经理';
+                            break;
+                        case '4':
+                            $item['user_group'] = '初级合伙人';
+                            break;
+                        case '5':
+                            $item['user_group'] = '中级合伙人';
+                            break;
+                        case '6':
+                            $item['user_group'] = '高级合伙人';
+                            break;
+                        case '7':
+                            $item['user_group'] = '董事';
+                            break;
+                    }
+                    $arr[] = array(
+                        $item['bill_id'],
+                        $item['create_time'],
+                        $item['nickname'],
+                        $item['phone'],
+                        $item['user_group'],
+                        $item['number'],
+                        $item['status'],
+                        $item['order_sn'],
+                        $item['mark']
+                    );
+                }
+                return $this->getStatisticsExcel([
+                    'ID','时间','用户昵称','手机号','当前身份','金额','状态','关联订单','说名',
+                ], $arr, $title);
+            }
+        }
+
+
         $data['list'] = $this->date_where($query, $where['date'], 'ub.create_time')
             ->field('ub.bill_id,ub.title,ub.number,ub.mark,ub.take_time,ub.commission_type,u.uid,u.phone,u.nickname,u.user_group,ub.order_sn,ub.take_time,ub.status,ub.create_time')
             ->order('ub.bill_id', 'desc')
@@ -633,6 +754,43 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pm,uss.reward_socre,o.order_sn,uss.status,uss.mark,u.score')
+            ->order('uss.id', 'desc')
+            ->select();
+            $arr = [];
+            foreach ($date['list'] as $k=>$item){
+                switch ($item['status']) {
+                    case '1':
+                        $item['status'] = '有效';
+                        break;
+                    case '-1':
+                        $item['status'] = '待确认';
+                        break;
+                    case '0':
+                        $item['status'] = '已失效';
+                        break;
+                }
+                $arr[] = array(
+                    $item['id'],
+                    date('Y-m-d H:i:s', $item['addtime']),
+                    $item['nickname'],
+                    $item['phone'],
+                    $item['reward_socre'],
+                    $item['status'],
+                    $item['order_sn'],
+                    $item['mark']
+                );
+            }
+            return $this->getStatisticsExcel([
+                'ID','时间','用户昵称','手机号','积分数','结算状态','关联订单','说名',
+            ], $arr, '积分统计');
+        }
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pm,uss.reward_socre,o.order_sn,uss.status,uss.mark,u.score')
             ->page($page, $limit)
@@ -703,6 +861,43 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
+            ->order('uss.id', 'desc')
+            ->select();
+            $arr = [];
+            foreach ($date['list'] as $k=>$item){
+                switch ($item['status']) {
+                    case '1':
+                        $item['status'] = '有效';
+                        break;
+                    case '-1':
+                        $item['status'] = '待确认';
+                        break;
+                    case '0':
+                        $item['status'] = '已失效';
+                        break;
+                }
+                $arr[] = array(
+                    $item['id'],
+                    date('Y-m-d H:i:s', $item['addtime']),
+                    $item['nickname'],
+                    $item['phone'],
+                    $item['number'],
+                    $item['status'],
+                    $item['order_sn'],
+                    $item['mark']
+                );
+            }
+            return $this->getStatisticsExcel([
+                'ID','时间','用户昵称','手机号','京豆数','状态','关联订单','说名',
+            ], $arr, '京豆统计');
+        }
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
             ->page($page, $limit)
@@ -746,9 +941,6 @@ class FinanceRepository extends BaseRepository
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
             $query->where('uss.uid', $params['uid']);
         })
-        // ->when(isset($params['pm']) && $params['pm'] != '', function ($query) use ($params) {
-        //     $query->where('uss.pm', $params['pm']);
-        // })
         ->when(isset($params['status']) && $params['status'] != '', function ($query) use ($params) {
             $query->where('uss.status', $params['status']);
         })
@@ -765,6 +957,43 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] =  $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
+            ->order('uss.number', 'desc')
+            ->select();
+            $arr = [];
+            foreach ($date['list'] as $k=>$item){
+                switch ($item['status']) {
+                    case '1':
+                        $item['status'] = '有效';
+                        break;
+                    case '-1':
+                        $item['status'] = '待确认';
+                        break;
+                    case '0':
+                        $item['status'] = '已失效';
+                        break;
+                }
+                $arr[] = array(
+                    $item['id'],
+                    date('Y-m-d H:i:s', $item['addtime']),
+                    $item['nickname'],
+                    $item['phone'],
+                    $item['number'],
+                    $item['status'],
+                    $item['order_sn'],
+                    $item['mark']
+                );
+            }
+            return $this->getStatisticsExcel([
+                'ID','时间','用户昵称','手机号','贡献值数','贡献值状态','关联订单','说名',
+            ], $arr, '贡献值统计');
+        }
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
             ->page($page, $limit)
@@ -836,6 +1065,43 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+            ->field('uss.id,uss.addtime,uss.commission_type,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
+            ->order('uss.id', 'desc')
+            ->select();
+            $arr = [];
+            foreach ($date['list'] as $k=>$item){
+                switch ($item['status']) {
+                    case '1':
+                        $item['status'] = '有效';
+                        break;
+                    case '-1':
+                        $item['status'] = '待确认';
+                        break;
+                    case '0':
+                        $item['status'] = '已失效';
+                        break;
+                }
+                $arr[] = array(
+                    $item['id'],
+                    date('Y-m-d H:i:s', $item['addtime']),
+                    $item['nickname'],
+                    $item['phone'],
+                    $item['number'],
+                    $item['status'],
+                    $item['order_sn'],
+                    $item['mark']
+                );
+            }
+            return $this->getStatisticsExcel([
+                'ID','时间','用户昵称','手机号','复购金数','复购金状态','关联订单','说名',
+            ], $arr, '复购金统计');
+        }
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,uss.commission_type,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
             ->page($page, $limit)
@@ -898,6 +1164,43 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
+            ->order('uss.id', 'desc')
+            ->select();
+            $arr = [];
+            foreach ($date['list'] as $k=>$item){
+                switch ($item['status']) {
+                    case '1':
+                        $item['status'] = '有效';
+                        break;
+                    case '-1':
+                        $item['status'] = '待确认';
+                        break;
+                    case '0':
+                        $item['status'] = '已失效';
+                        break;
+                }
+                $arr[] = array(
+                    $item['id'],
+                    date('Y-m-d H:i:s', $item['addtime']),
+                    $item['nickname'],
+                    $item['phone'],
+                    $item['number'],
+                    $item['status'],
+                    $item['order_sn'],
+                    $item['mark']
+                );
+            }
+            return $this->getStatisticsExcel([
+                'ID','时间','用户昵称','手机号','红包数','红包状态','关联订单','说名',
+            ], $arr, '红包统计');
+        }
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.status,uss.mark,u.score')
             ->page($page, $limit)
@@ -962,6 +1265,39 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
+            ->order('uss.id', 'desc')
+            ->select();
+            $arr = [];
+            foreach ($date['list'] as $k=>$item){
+                switch ($item['type']) {
+                    case '1':
+                        $item['type'] = '转入';
+                        break;
+                    case '2':
+                        $item['type'] = '消耗';
+                        break;
+                }
+                $arr[] = array(
+                    $item['id'],
+                    date('Y-m-d H:i:s', $item['addtime']),
+                    $item['nickname'],
+                    $item['phone'],
+                    $item['number'],
+                    $item['type'],
+                    $item['mark']
+                );
+            }
+            return $this->getStatisticsExcel([
+                'ID','时间','用户昵称','手机号','VR数','VR类型','说名',
+            ], $arr, 'VR统计');
+        }
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,uss.type,uss.mark,u.score')
             ->page($page, $limit)
@@ -994,10 +1330,10 @@ class FinanceRepository extends BaseRepository
         $where = request()->params(['date']);
         $params = request()->params([ 'uid', 'pm', 'phone','status']);
 
-        if($params['status'] == 99){
-            unset($params['status']);
-            $params['type'] = 2;
-        }
+        // if($params['status'] == 99){
+        //     unset($params['status']);
+        //     $params['type'] = 2;
+        // }
 
         $date = [];
         //商户ID
@@ -1024,6 +1360,44 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
+            ->order('uss.id', 'desc')
+            ->select();
+            $arr = [];
+            foreach ($date['list'] as $k=>$item){
+                switch ($item['status']) {
+                    case '1':
+                        $item['status'] = '有效';
+                        break;
+                    case '-1':
+                        $item['status'] = '待确认';
+                        break;
+                    case '0':
+                        $item['status'] = '已失效';
+                        break;
+                }
+                $arr[] = array(
+                    $item['id'],
+                    date('Y-m-d H:i:s', $item['addtime']),
+                    $item['nickname'],
+                    $item['phone'],
+                    $item['pv'],
+                    $item['status'],
+                    $item['order_sn'],
+                    $item['mark']
+                );
+            }
+            return $this->getStatisticsExcel([
+                'ID','时间','用户昵称','手机号','PV数','状态','关联订单','说名',
+            ], $arr, 'PV统计');
+        }
+
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
             ->page($page, $limit)
@@ -1088,6 +1462,42 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+
+        //导出数据
+        $is_excel = request()->param('is_excel', 0);
+        if($is_excel == 1){
+            $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,o.total_price,uss.status,uss.mark,u.score,m.mer_name')
+            ->order('uss.id', 'desc')
+            ->select();
+            $arr = [];
+            foreach ($date['list'] as $k=>$item){
+                switch ($item['status']) {
+                    case '1':
+                        $item['status'] = '有效';
+                        break;
+                    case '-1':
+                        $item['status'] = '待确认';
+                        break;
+                    case '0':
+                        $item['status'] = '已失效';
+                        break;
+                }
+                $arr[] = array(
+                    $item['id'],
+                    date('Y-m-d H:i:s', $item['addtime']),
+                    $item['number'],
+                    $item['total_price'],
+                    $item['status'],
+                    $item['mer_name'],
+                    $item['order_sn']
+                );
+            }
+            return $this->getStatisticsExcel([
+                'ID','时间','商户分润金额','订单金额','状态','店铺名称','关联订单',
+            ], $arr, '商户分润统计');
+        }
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.number,o.order_sn,o.total_price,uss.status,uss.mark,u.score,m.mer_name')
             ->page($page, $limit)
@@ -1108,6 +1518,37 @@ class FinanceRepository extends BaseRepository
     }
 
 
+    /**
+     * 获取统计导出
+     */
+    public function getStatisticsExcel($header,$arr,$title)
+    {
+        $filename = $title.'_'.date('YmdHis').'_'.rand(10000,99999);
+        $name = $filename;
+        $info = '生成时间:' . date('Y-m-d H:i:s',time());
+        $suffix='xlsx';
+        $path='extract';
+        unset($_instance);
+
+        $_instance = SpreadsheetExcelService::instance_xin();
+
+        $_path =$_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile($title, $name, $info)
+            ->setExcelContent($arr)
+            ->excelSave($filename, $suffix, $path);
+
+        $domain = request()->domain();
+        $data= [
+            'name' => $filename.'.'.$suffix,
+            'status' => 1,
+            'path' => $domain.'/'.$_path
+        ];
+
+        return $data;
+    }
+
 
     /**
      * 列表中的时间条件

app/common/repositories/store/order/StoreOrderRepository.php

@@ -3684,6 +3684,21 @@ class StoreOrderRepository extends BaseRepository
     public function yugu_rebate_gong_fu($order)
     {
 
+        $make="";
+        $type_shop = $order['type_shop']??0;
+        if($type_shop==1){
+            $make="拼多多";
+        }else if($type_shop==5){
+            $make="淘宝";
+        }else if($type_shop==6){
+            $make="京东";
+        }else if($type_shop==3){
+            $make="苏宁";
+        }else if($type_shop==2){
+            $make="唯品会";
+        }else if($type_shop==9){
+            $make="话费";
+        }
 
         $order_sn = $order["order_sn"];
         log::info("进入添加养老金{$order['order_sn']}");
@@ -3729,11 +3744,11 @@ class StoreOrderRepository extends BaseRepository
         log::info("++{$order['total_price']}+返回佣金===={$oldagefee}");
         //当前已扣会费总额
 //            $oldagefee = $oldagefee-$dues;
-        $mark = "消费获得养老金" . $oldagefee;
+        $mark = $make."消费获得养老金" . $oldagefee;
 
         //end会费
         //sat存养老金
-        $title = "养老金 ";
+        $title = "养老金";
         $commission_type = 5;
         if ($oldagefee >= 0.01) {
             $this->add_bill($title, $oldagefee, $order["uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], 0, 0, $order["type_shop"]);
@@ -3749,7 +3764,7 @@ class StoreOrderRepository extends BaseRepository
         $zijiUser = Db::name("user")->where('uid', $order["uid"])->find();
         // 老用户发红包奖励
         if($zijiUser['is_old'] == 1){
-            $this->giveHongBao($order["uid"], $pvfee, $order_id, '消费赠送红包');
+            $this->giveHongBao($order["uid"], $pvfee, $order_id, $make.'消费赠送红包');
         }
         $sprerdUser = Db::name("user")->where('uid', $zijiUser['spread_uid'])->find();
         //不为空的时候进行添加推荐奖励
@@ -3808,17 +3823,17 @@ class StoreOrderRepository extends BaseRepository
                 $yongjinbili = 17;
             }
 
+            //计算出佣金
             $yongjin = $pvfee * $yongjinbili / 100;
-            // 佣金百分之90进入佣金池
-            // $tuiguanyongjin = round($yongjin * 0.9, 2);
-            $tuiguanyongjin = bcmul($pvfee, $yongjinbili / 100, 2);
-
 
-            $tuiYongmark = "推荐消费获得佣金" . $tuiguanyongjin;
+            // 佣金百分之90进入佣金池  佣金百分之10进入复购金
+            $tuiguanyongjin = roundOptimize($yongjin * 0.9, 2);
+            $tuiguanfugou = $yongjin;//复购金赠送函数里面有计算百分之10
 
             //end会费
             //sat存养老金
             $tuiYongzhoutitle = "推广佣金 ";
+            $tuiYongmark = "推荐消费获得佣金" . $tuiguanyongjin;
             $commission_yong_type = 3;
             if ($tuiguanyongjin >= 0.01) {
                 $this->add_bill($tuiYongzhoutitle, $tuiguanyongjin, $sprerdUser["uid"], $tuiYongmark, $commission_yong_type, $order_sn, $order_id, $order["mer_id"], 0, 0, $order["type_shop"]);
@@ -3826,12 +3841,12 @@ class StoreOrderRepository extends BaseRepository
                 Db::name('log')->insert(['data' => '订单号：' . $order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
             }
 
-            if($yongjin >= 0.1){
+            if($tuiguanfugou >= 0.1){
                 // 佣金百分之10进入复购金
                 $orderThird = app()->make(UserThirdRepository::class);
                 //复购金
                 $orderThird->yuguFugou(
-                    $yongjin,
+                    $tuiguanfugou,
                     $sprerdUser["uid"],
                     $order_sn,
                     $order["type_shop"]
@@ -9609,8 +9624,10 @@ class StoreOrderRepository extends BaseRepository
                 // 贡献值
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
                 $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送PV值");
-                // 红包
-                $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
+                if (!empty($user_data['is_old'])) {
+                    // 红包
+                    $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
+                }
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送积分");
 
@@ -9622,8 +9639,8 @@ class StoreOrderRepository extends BaseRepository
                     $rate = static::getUserGroupRate($spread_data['user_group']);
 
                     if ($spread_data['user_group'] == 1) {
-                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv * 0.9, $rate, 2);
+                        $fgj_amount_10 = bcmul($pv * 0.1, $rate, 2);//推广者的佣金抽10%到个人复购金
 
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
@@ -9637,8 +9654,8 @@ class StoreOrderRepository extends BaseRepository
                     } else if ($spread_data['user_group'] > 1) {
 
                         $ssf = bcmul($pv, $rate, 2);
-                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv * 0.9, $rate, 2);
+                        $fgj_amount_10 = bcmul($pv * 0.1, $rate, 2);//推广者的佣金抽10%到个人复购金
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                         //贡献值
@@ -9658,8 +9675,8 @@ class StoreOrderRepository extends BaseRepository
                     $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
                     if (!empty($merchant_user_data)) {
                         //给推广者分配佣金
-                        $yj_amount_90 = bcmul($pv, 0.05, 2) * 0.9;
-                        $fgj_amount_10 = bcmul($pv, 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv * 0.9, 0.05, 2);
+                        $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
                         //推广佣金
                         $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                     }
@@ -9837,8 +9854,10 @@ class StoreOrderRepository extends BaseRepository
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
                 // 购买商贸区赠送PV值
                 $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
-                // 红包
-                $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
+                if (!empty($user_data['is_old'])) {
+                    // 红包
+                    $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
+                }
                 // 积分
                 $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
 
@@ -9849,8 +9868,8 @@ class StoreOrderRepository extends BaseRepository
                     $rate = static::getUserGroupRate($spread_data['user_group']);
                     if ($spread_data['user_group'] > 1) {
                         $ssf = bcmul($pv, $rate, 2);
-                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv * 0.9, $rate, 2);
+                        $fgj_amount_10 = bcmul($pv * 0.1, $rate, 2);//推广者的佣金抽10%到个人复购金
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                         //贡献值
@@ -9867,8 +9886,8 @@ class StoreOrderRepository extends BaseRepository
                     if ($spread_data['user_group'] == 1) {
                         //给推广者分配佣金
 
-                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv * 0.9, $rate, 2);
+                        $fgj_amount_10 = bcmul($pv * 0.1, $rate, 2);//推广者的佣金抽10%到个人复购金
 
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
@@ -9887,8 +9906,8 @@ class StoreOrderRepository extends BaseRepository
                     $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
                     if (!empty($merchant_user_data)) {
                         //给推广者分配佣金
-                        $yj_amount_90 = bcmul($pv, 0.05, 2) * 0.9;
-                        $fgj_amount_10 = bcmul($pv, 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                        $yj_amount_90 = bcmul($pv * 0.9, 0.05, 2);
+                        $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
                         $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
                         //推广佣金
                         $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);

app/common/repositories/user/UserThirdRepository.php

@@ -747,7 +747,6 @@ class UserThirdRepository extends BaseRepository
     /**
      * 添加预估积分记录
      */
-//预估养老金
     public static function yuguJifen($price,$user_id,$order_sn,$type_shop)
     {
         if (empty($user_id)) {
@@ -775,14 +774,11 @@ class UserThirdRepository extends BaseRepository
 
             $sanfangfenpei=json_decode($systemvalueObj['value'],true);
             $inc_score = $gongxian = round($price*$sanfangfenpei['pv'],2);//pv=佣金的50%=积分=贡献值
-//            log::info("===========dddddddddddddddddddd");
 
 
             //每个表的统计值
             $jfzongwei=Db::name('user_sign_score')->where('status', -1)->where('uid', $user_id)->sum('reward_socre');
             $gxzongwei=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user_id)->sum('number');
-//            type_shop 1 拼多多 ，5淘宝
-//            log::info("==========={$jfzongwei}");
 
             $make="";
             if($type_shop==1){
@@ -817,26 +813,12 @@ class UserThirdRepository extends BaseRepository
                 ];
             log::info("{$make}==准备开始添加积分，贡献");
             Db::name("user_sign_score")->insert($data);//添加积分记录
-
             log::info("准备开始添加积分");
-//            $ins_data['uid'] = $user_id;
-//            $ins_data['reward_socre'] = $inc_score;
-//            $ins_data['addtime'] = time();
-//            $ins_data['status'] = -1;
-//            $ins_data['order_type'] = $type_shop;
-//            $ins_data['order_id'] = $order_sn;
-//            $ins_data['mark'] = "购买三方商品赠送积分";
-//            $ins_data['desc'] = '';
-//            $ins_data['surplus'] = $user_score + $inc_score;
-//            $ins_data['type'] = 1;
-//            $ins_data['pm'] = 1;
-//            $ins_data['source_type'] =3;
 
 
             //赠送贡献值
             $gongxian_data = [
                 "uid"           =>$user_id,
-//                "number"  =>    $inc_score,
                 "number"  =>    $gongxian,
                 "addtime"       =>time(),
                 "status"        =>-1,
@@ -847,21 +829,6 @@ class UserThirdRepository extends BaseRepository
                 "surplus"       =>$surplusgongxian+$gxzongwei,
                 "type"          =>1
             ];
-
-//            $gongxian_data['uid'] = $user_id;
-//            $gongxian_data['number'] = $inc_score;
-//            $gongxian_data['addtime'] = time();
-//            $gongxian_data['status'] = -1;
-//            $gongxian_data['order_type'] = $type_shop;
-//            $gongxian_data['order_id'] = $order_sn;
-//            $gongxian_data['mark'] = "购买三方商品赠送贡献值";
-//            $gongxian_data['desc'] = '';
-//            $gongxian_data['surplus'] = $user_score + $inc_score;
-//            $gongxian_data['type'] = 1;
-//            $gongxian_data['pm'] = 1;
-//            $gongxian_data['source_type'] =3;
-
-
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加贡献记录
             log::info("===添加完积分和贡献值");
 
@@ -880,7 +847,7 @@ class UserThirdRepository extends BaseRepository
             //判断是否是老用户  is_old=1是1.0的用户，1.0的用户要总pv*45%的红包
             if($user["is_old"]==1){
                 //添加红包
-                $hongbao=round($inc_score*0.45,2);
+                $hongbao=roundOptimize($inc_score*0.45,2);
                 $hongbao_data = [
                     "uid"           =>$user_id,
                     "number"  =>    $hongbao,
@@ -895,51 +862,20 @@ class UserThirdRepository extends BaseRepository
                 ];
                 Db::name("user_sign_hongbao")->insert($hongbao_data);//添加贡献记录
                 log::info("===添加完红包奖励");
-
             }
 
 
-
             // 添加推荐奖励
             $zijiUser=Db::name("user")->where('uid',$user_id)->find();
             $sprerdUser= Db::name("user")->where('uid',$zijiUser['spread_uid'])->find();
             //不为空的时候进行添加推荐奖励
             if($sprerdUser){
-                //奖励推广佣金
+                //奖励推广
                 $yongjinbili=0;
-                //普通用户
-                if($sprerdUser["user_group"]==1){
-                    $yongjinbili=5;
-                }
-                //业务员
-                if($sprerdUser["user_group"]==2){
-                    $yongjinbili=7;
-                }
-                //业务经理
-                if($sprerdUser["user_group"]==3){
-                    $yongjinbili=9;
-                }
-                //初级合伙人
-                if($sprerdUser["user_group"]==4){
-                    $yongjinbili=11;
-                }
-                //中级合伙人
-                if($sprerdUser["user_group"]==5){
-                    $yongjinbili=13;
-                }
-                //高级合伙人
-                if($sprerdUser["user_group"]==6){
-                    $yongjinbili=15;
-                }
-                //懂事
-                if($sprerdUser["user_group"]==7){
-                    $yongjinbili=17;
-                }
+        
                 // @todo 用户身份比例
                 $yongjinbili = StoreOrderRepository::getUserGroupRate($sprerdUser['user_group']);
-
-                $tuiguanyongjin=round($yongjinbili*$inc_score/100,2);//按照身份获得佣金
-
+                $tuiguanyongjin=roundOptimize($yongjinbili*$inc_score,2);//按照身份获得佣金
 
                 //添加推广积分
                 $tuijifendata = [
@@ -949,8 +885,8 @@ class UserThirdRepository extends BaseRepository
                     "status"        =>  -1,
                     "order_type"    =>  $type_shop,
                     "order_id"      =>  $order_sn,
-                    "mark"          =>  "推广消费从{$make}购买商品赠送积分",
-                    "surplus"       =>  $surplus,
+                    "mark"          =>  "推广{$make}商品赠送积分",
+                    "surplus"       =>  $sprerdUser['score'] + $tuiguanyongjin,
                     "pm"            =>  1,
                     "source_type"   =>  4
                 ];
@@ -958,26 +894,25 @@ class UserThirdRepository extends BaseRepository
                 Db::name("user_sign_score")->insert($tuijifendata);//添加积分记录
 
 
-                //添加推荐献值
+                //添加推荐献值 普通用户 贡献值为 pv* 30%；推广人是业务员及以上身份，贡献值为:pv的1:1
+                if($sprerdUser['user_group'] <= 1){
+                    $gongxian = roundOptimize($gongxian*0.3,2);
+                }
                 $tuigangongxian_data = [
                     "uid"           =>$sprerdUser['uid'],
-//                    "number"  =>    $tuiguanyongjin,
                     "number"  =>    $gongxian,
                     "addtime"       =>time(),
                     "status"        =>-1,
                     "order_type"    =>$type_shop,
                     "order_id"      =>$order_sn,
-                    "mark"          =>"推广消费从{$make}购商品赠送贡献值",
+                    "mark"          =>"推广{$make}商品赠送贡献值",
                     "desc"          =>'',
-                    "surplus"       =>$surplusgongxian+$gxzongwei,
+                    "surplus"       => $sprerdUser['contribute'] + $gongxian,
                     "type"          =>1
                 ];
 
                 Db::name("user_sign_gongxian")->insert($tuigangongxian_data);//添加贡献记录
                 log::info("===添加完积分和贡献值");
-
-
-
             }
 
 

app/controller/api/Auth.php

@@ -913,28 +913,28 @@ class Auth extends BaseController
 
     public function getteamsnum($teamid){
 
-        $subordinate_members = Db::name('user')
-            ->alias('u')
-            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
-            ->where("u.spread_uid", $teamid)
-            ->where("so.mer_id", 496)
-            ->group('u.uid')
-
-            ->select();
-
-
-        $total_amount_pv_team = 0;
-        $team_count_total = 0;
-
-        foreach ($subordinate_members as $k => $v) {
-            $t_teams_pv = $this->calculatePerformance($v['uid']);
-            $total_amount_pv_team += $t_teams_pv['total_performance'];
-            $team_count_total += $t_teams_pv['team_count'];
-
-
-        }
+//        $subordinate_members = Db::name('user')
+//            ->alias('u')
+//            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+//            ->where("u.spread_uid", $teamid)
+//            ->where("so.mer_id", 496)
+//            ->group('u.uid')
+//
+//            ->select();
+//
+//
+//        $total_amount_pv_team = 0;
+//        $team_count_total = 0;
+//
+//        foreach ($subordinate_members as $k => $v) {
+//            $t_teams_pv = $this->calculatePerformance($v['uid']);
+//            $total_amount_pv_team += $t_teams_pv['total_performance'];
+//            $team_count_total += $t_teams_pv['team_count'];
+//
+//
+//        }
 
-        return $team_count_total;
+        return Db::name('user')->where(['spread_uid'=>$teamid])->count();
 
     }
 

app/controller/api/Notify.php

@@ -187,8 +187,10 @@ class Notify
                                     $this->con_log_pv($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送pv");
                                     $this->con_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送贡献值");
                                     $this->score_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送积分");
-                                    // 红包
-                                    $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
+                                    if (!empty($user_data['is_old'])) {
+                                        // 红包
+                                        $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
+                                    }
 
                                     //给推广者分配养老金
                                     //给推广者分配佣金
@@ -198,8 +200,8 @@ class Notify
                                         $StoreOrderRepository = app()->make(StoreOrderRepository::class);
                                         $rate = $StoreOrderRepository->getUserGroupRate($spread_data['user_group']);
                                     if ($spread_data['user_group'] == 1) {
-                                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                        $yj_amount_90 = bcmul($pv * 0.9, $rate, 2);
+                                        $fgj_amount_10 = bcmul($pv * 0.1, $rate, 2);//推广者的佣金抽10%到个人复购金
 
                                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
@@ -213,8 +215,8 @@ class Notify
                                     } else if ($spread_data['user_group'] > 1) {
 
                                         $ssf = bcmul($pv, $rate, 2);
-                                        $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                                        $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                        $yj_amount_90 = bcmul($pv * 0.9, $rate, 2);
+                                        $fgj_amount_10 = bcmul($pv * 0.1, $rate, 2);//推广者的佣金抽10%到个人复购金
                                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                                         //贡献值
@@ -481,8 +483,8 @@ class Notify
                                     $uer_bill = $spread_data['annuity'] + bcmul($pv, 0.035,2);
 
 
-                                    $yj_amount_90 = $le_yw_amount * 0.9;
-                                    $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
+                                    $yj_amount_90 = bcmul($le_yw_amount,0.9,2);
+                                    $fgj_amount_10 = bcmul($le_yw_amount,0.1,2);//推广者的佣金抽10%到个人复购金
 
                                     $yongjin = $spread_data['brokerage_price'] + $yj_amount_90;
                                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -524,8 +526,8 @@ class Notify
                                     if(!empty($merchant_user_data)){
 
 
-                                        $yj_amount_90 = bcmul($pv, 0.035,2) * 0.9;
-                                        $fgj_amount_10 = bcmul($pv, 0.035,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                        $yj_amount_90 = bcmul($pv * 0.9, 0.035,2);
+                                        $fgj_amount_10 = bcmul($pv * 0.1, 0.035,2);//推广者的佣金抽10%到个人复购金
 
                                         $yj_amount = $merchant_data['brokerage_price'] + $yj_amount_90;
                                         $fgj_amount = $merchant_data['fugou'] + $fgj_amount_10;
@@ -627,16 +629,17 @@ class Notify
                                     $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
                                     // 积分
                                     $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
-                                    // 红包
-                                    $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
-
+                                    if (!empty($user_data['is_old'])) {
+                                        // 红包
+                                        $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
+                                    }
                                     $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
                                     if($spread_data) {
                                         $StoreOrderRepository = app()->make(StoreOrderRepository::class);
                                         $rate = $StoreOrderRepository->getUserGroupRate($spread_data['user_group']);
                                         if ($spread_data['user_group'] == 1) {
-                                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $yj_amount_90 = bcmul($pv * 0.9, $rate, 2);
+                                            $fgj_amount_10 = bcmul($pv * 0.1, $rate, 2);//推广者的佣金抽10%到个人复购金
 
                                             $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
@@ -650,8 +653,8 @@ class Notify
                                         } else if ($spread_data['user_group'] > 1) {
 
                                             $ssf = bcmul($pv, $rate, 2);
-                                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-                                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $yj_amount_90 = bcmul($pv * 0.9, $rate, 2);
+                                            $fgj_amount_10 = bcmul($pv * 0.1, $rate, 2);//推广者的佣金抽10%到个人复购金
                                             $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                                             //贡献值
@@ -664,44 +667,6 @@ class Notify
                                             $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
                                         }
                                     }
-//                                    if ($user_data['spread_uid'] != 0) {
-//                                        //查询下单用户上级
-//                                        $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
-//                                        /** @var \app\common\repositories\store\order\StoreOrderRepository $StoreOrderRepository */
-//                                        $rate = $StoreOrderRepository->getUserGroupRate($spread_data['user_group']);
-//                                        if ($spread_data['user_group'] > 1) {
-//                                            $ssf = bcmul($pv, $rate, 2);
-//                                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-//                                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-//                                            $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
-//
-//                                            //贡献值
-//                                            $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
-//                                            //积分
-//                                            $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
-//                                            //推广佣金
-//                                            $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
-//                                            //养老金
-//                                            $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
-//                                        }
-//
-//                                        //普通用户推广人
-//                                        if ($spread_data['user_group'] == 1) {
-//                                            //给推广者分配佣金
-//
-//                                            $yj_amount_90 = bcmul($pv, $rate, 2) * 0.9;
-//                                            $fgj_amount_10 = bcmul($pv, $rate, 2) * 0.1;//推广者的佣金抽10%到个人复购金
-//
-//                                            $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
-//
-//                                            //推广佣金
-//                                            $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
-//                                            // 贡献值
-//                                            $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
-//                                            // 积分
-//                                            $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
-//                                        }
-//                                    }
 
                                     //锁客收益
                                     if ($user_data['mer_id'] != 0) {
@@ -709,8 +674,8 @@ class Notify
                                         $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
                                         if (!empty($merchant_user_data)) {
                                             //给推广者分配佣金
-                                            $yj_amount_90 = bcmul($pv, 0.05, 2) * 0.9;
-                                            $fgj_amount_10 = bcmul($pv, 0.05, 2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $yj_amount_90 = bcmul($pv * 0.9, 0.05, 2);
+                                            $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
                                             $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
                                             //推广佣金
                                             $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);

app/controller/api/store/service/Huafei.php

@@ -213,13 +213,13 @@ class Huafei extends BaseController
 			$order_sn,
 			$type_shop
 		);						
-		//复购金
-		$orderThird->yuguFugou(
-			$commissionMoney,
-			$uid,
-			$order_sn,
-			$type_shop
-		);	
+		// //复购金
+		// $orderThird->yuguFugou(
+		// 	$commissionMoney,
+		// 	$uid,
+		// 	$order_sn,
+		// 	$type_shop
+		// );	
 
 		//推送订单
 		$push = $this->pushOrder($order_sn, $phone, $money);

app/controller/api/user/User.php

@@ -1574,15 +1574,25 @@ class User extends BaseController
         $user = Db::name('user')->where('uid', $user_id)->field('uid,nickname,avatar,spread_uid,pv,create_time')->find();
         $child_nums = $this->getdepartmentStatistics($user_id);
         $child_nums_Tree = $this->buildTreePv($child_nums, $user['spread_uid']);
+        $new_performance = 0; //一周内新增总业绩
+        $end_time = date('Y-m-d ' . '00:00:00', strtotime('-7 days'));
         $person_nums_pv = 0;//大部门业绩
         $common_nums_pv = 0;//小部门业绩
         $aLL_list = [];//全部数据
         $person_list = [];//大部门数据
         $common_list = [];//小部门数据
         if(count($child_nums_Tree) && isset($child_nums_Tree[0]['children']) && count($child_nums_Tree[0]['children'])){
+            // 计算总新增业绩
+            $uid_list = array_column($child_nums, 'uid');
+            $uid_list = array_diff($uid_list,[$user_id]);
+            $new_performance = Db::name("user_pv_log")->where([['uid','in',$uid_list],['settlement_time','>',$end_time]])->sum('pv');
             //获取大部门的key
             $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_pv')), array_column($child_nums_Tree[0]['children'], 'total_pv'));
             foreach($child_nums_Tree[0]['children'] as $k=>$v){
+                $child_nums = $this->getdepartmentStatistics($v['uid']);
+                $uid_list = array_column($child_nums, 'uid');
+                array_push($uid_list,$v['uid']);
+                $new_performance_child = Db::name("user_pv_log")->where([['uid','in',$uid_list],['settlement_time','>',$end_time]])->sum('pv');
                 if($k == $maxBalanceIndex){
                     $person_list[] = [
                         "uid" => $v["uid"],
@@ -1592,7 +1602,8 @@ class User extends BaseController
                         "pv" => $v['pv'],
                         "total_performance" => (int)$v['total_pv'],
                         "create_time" => $v['create_time'],
-                        'team_count'=> $v['team_count']
+                        'team_count'=> $v['team_count'],
+                        'new_performance' => $new_performance_child
                     ];
                     $person_nums_pv = bcadd($person_nums_pv,$v['total_pv']);
                 }else{
@@ -1604,7 +1615,8 @@ class User extends BaseController
                         "pv" => $v['pv'],
                         "total_performance" => (int)$v['total_pv'],
                         "create_time" => $v['create_time'],
-                        'team_count'=> $v['team_count']
+                        'team_count'=> $v['team_count'],
+                        'new_performance' => $new_performance_child
                     ];
                     $common_nums_pv = bcadd($common_nums_pv,$v['total_pv']);
                 }
@@ -1616,7 +1628,8 @@ class User extends BaseController
                     "pv" => $v['pv'],
                     "total_performance" => (int)$v['total_pv'],
                     "create_time" => $v['create_time'],
-                    'team_count'=> $v['team_count']
+                    'team_count'=> $v['team_count'],
+                    'new_performance' => $new_performance_child
                 ];
             }
         }
@@ -1657,7 +1670,7 @@ class User extends BaseController
             $data['teamid'] = $teamid;
             $data['team_list'] = $data1;
             $data['fans_num'] = $child_nums_Tree[0]['team_count'];//总人数
-            $data['new_performance'] = 0;//新增业绩
+            $data['new_performance'] = $new_performance;//新增总业绩
             $data['total_performance'] = (int)bcadd($child_nums_Tree[0]['total_pv'] ?? 0, 0, 2);//总业绩
             $data['person_nums'] = count($person_list);//大部门人数
             $data['common_nums'] = count($common_list);//小部门人数