养老金调整，从pv5%到佣金的50%

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

@@ -3163,8 +3163,8 @@ class StoreOrderRepository extends BaseRepository
         //养老金
 //            $oldagefee=$this->decimal2($order["extension_one"]* $yanglao * 0.01);
 
-        //y养老金最新调整 =佣金的*50%*5%
-        $oldagefee=decimal2($order['total_price']*0.5*0.05);
+        //y养老金最新调整 =佣金的*50%
+        $oldagefee=decimal2($order['total_price']*0.5);
         log::info("++{$order['total_price']}+养老金===={$oldagefee}");
         //当前已扣会费总额
 //            $oldagefee = $oldagefee-$dues;

app/common/repositories/store/product/ProductRepository.php

@@ -801,8 +801,11 @@ class ProductRepository extends BaseRepository
         $where = array_merge($where, $this->dao->productShow());
 
         //搜索记录
-        if ($userInfo && isset($where['keyword']) && !empty($where['keyword']))
+        if ($userInfo && isset($where['keyword']) && !empty($where['keyword'])){
+            log::info("======sousuojilu====");
             app()->make(UserVisitRepository::class)->searchProduct($userInfo['uid'], $where['keyword']);
+        }
+
 
         $query = $this->dao->search($merId, $where)->with(['merchant']);
         $query->with(['issetCoupon']);

app/common/repositories/system/merchant/MerchantRepository.php

@@ -415,6 +415,10 @@ class MerchantRepository extends BaseRepository
     public function productList($merId, $where, $page, $limit, $userInfo,$type439=false)
     {
         log::info("========j进入prodctList");
+        log::info($merId);
+        log::info( $where);
+//        log::info($userInfo);
+        log::info($type439);
         $list=app()->make(ProductRepository::class)->getApiSearch($merId, $where, $page, $limit, $userInfo,$type439);
         $arr=[];
         foreach ($list["list"] as $v){

app/controller/api/store/merchant/Merchant.php

@@ -87,7 +87,7 @@ class Merchant extends BaseController
     }
     public function productTypeList()
     {
-        $params= $this->request->params(['type','pageNum','pageSize']);
+        $params= $this->request->params(['type','mer_cate_id','pageNum','pageSize']);
         $name=$params['type'];
 
         $domain = $this->request->domain();
@@ -97,7 +97,7 @@ class Merchant extends BaseController
             $id=486;
         }else if($name=='jingpin'){
             $id=439;
-            $type439=false;
+//            $type439=false;
         }else if($name=='jifen'){
             $id=148;
         }else if($name=='gongchang'){
@@ -120,6 +120,11 @@ class Merchant extends BaseController
         $where['is_used'] = 1;
         $where['product_type'] = 0;
         $where['is_hide'] = 0;
+        log::info("====={$params['mer_cate_id']}===");
+        if($params['mer_cate_id']){
+            $where['cate_id'] =$params['mer_cate_id'];
+        }
+
         return app('json')->success($this->repository->productList($id,$where, $page, $limit,$this->userInfo,$type439));
     }
 

app/controller/api/store/product/Jd.php

@@ -192,8 +192,8 @@ class Jd extends BaseController
         foreach ($list as $value) {
             $json = json_decode($value['json'], true);
             $json['pension'] = $json['pension']??'0';
-            $json['pv'] = $json['pension']*0.5;
-            $json['yanglaojin'] = $json['pv']*0.05;
+            $json['pv'] = $json['pension'];
+            $json['yanglaojin'] = $json['pension'];
 
             // $json['shopName'] = "";
             // $json['monthSales'] = "0";

app/controller/api/store/product/Jt.php

@@ -267,12 +267,14 @@ class Jt extends BaseController
     {
 //        $formatList = [];
         foreach ($goodsList as $value) {
+            log::info("京推推定时返回数据");
+            log::info($value);
             $finalPrice = $value['final_price']; //商品最终价格（使用优惠券后的商品最终价格）
             $commissionRate = $value['commissionShare'];  //京推推商品佣金比率
             $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate / 100)); // 商品最终价格 * 京推推商品佣金比率 /100 =最终佣金
 
-            $pv=$commissionMoney* 0.5;  //PV
-            $yanglaojin=$pv*0.05; //新的养老金
+            $pv=$commissionMoney*0.5;  //PV
+            $yanglaojin=$pv; //新的养老金
 
             
             //养老金
@@ -298,7 +300,7 @@ class Jt extends BaseController
                 'yanglaojin'=>$yanglaojin,
 
 
-                'commission' => $yanglaojin,//养老金
+                'commission' => $commissionMoney,//佣金金额
                 'commission_rate' => $commissionRate,
                 // 'sales' => $value['inOrderCount30Days'],
                 'coupon_money' => $couponMoney,//优惠券相关信息
@@ -330,7 +332,7 @@ class Jt extends BaseController
 
             Db::name("third_party_goods") -> insert([
                 'json'=>json_encode($formatList,JSON_UNESCAPED_UNICODE),
-                'pension'=>$yanglaojin,
+                'pension'=>$commissionMoney,
                 'type'=>2,                
                 'cid'=>$cid //一级分类
             ]);  //20250110 增加cid字段，json中增加 shopName,monthSales by Conner
@@ -529,11 +531,11 @@ class Jt extends BaseController
             $finalPrice = sprintf('%.2f', $finalPrice);
             $commissionRate = $detail['commissionInfo']['commissionShare'];
             //目前京东联盟等级只返回90%的收益，后续调整0.9即可
-            $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate * 0.9 / 100));
+            $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate / 100));
 
             $commission=$commissionMoney; //佣金(预估)
             $pv=$commission* 0.5;  //PV
-            $yanglaojin=$pv*0.05; //新的养老金
+            $yanglaojin=$pv; //新的养老金
 
             $gongxian=$pv; //新的养老金
             $jifen=$pv; //新的养老金

app/controller/api/store/product/Su.php

@@ -170,7 +170,7 @@ class Su extends BaseController
                     
                     $commission=$goods['commodityInfo']['commodityPrice'] * $goods['commodityInfo']['rate'] / 100; //佣金
                     $pv=round($commission* 0.5,2);  //PV
-                    $yanglaojin=round($pv*0.05,2); //新的养老金
+                    $yanglaojin=$pv; //新的养老金
 
 
                     // if($yanglaojin < 0.1) {
@@ -217,7 +217,7 @@ class Su extends BaseController
                     Db::name("third_party_goods")->insert([
                         'json' => json_encode($goods, JSON_UNESCAPED_UNICODE),
                         'type' => 4,
-                        'pension' => $yanglaojin,
+                        'pension' => $commission,
                         'cid'=>$cid //一级分类
                     ]);
                     
@@ -524,8 +524,12 @@ class Su extends BaseController
 
 
         $commission=$result['wapPrePayCommission'] ; //佣金(预估)
+//        $commission=$result['commodityInfo']['commodityPrice'] * $result['commodityInfo']['rate'] / 100; //佣金
+        log::info("===========commission=====$commission=============");
+        log::info("===========res==================");
+        log::info($result);
         $pv=$commission* 0.5;  //PV
-        $yanglaojin=$pv*0.05; //新的养老金
+        $yanglaojin=$pv; //新的养老金
 
         $gongxian=$pv; //新的养老金
         $jifen=$pv; //新的养老金

app/controller/api/store/product/TaoKe.php

@@ -191,8 +191,13 @@ class TaoKe extends BaseController
         $goodsList = [];
 
         // Log::info($goodsResult);
-        
+
+
+
+
         foreach ($goodsResult as $goods) {
+
+            log::info("=======min_normal_price====={$goods['min_normal_price']}==============");
             //var_dump($goods);
             $min_normal_price = sprintf('%.2f', $goods['min_normal_price'] / 100);
             $groupPrice = sprintf('%.2f', $goods['min_group_price'] / 100);
@@ -201,14 +206,15 @@ class TaoKe extends BaseController
             //佣金比例,千分比
             $commissionRate = $goods['promotion_rate'];
 
-            $commission = sprintf('%.2f', (($groupPrice * $commissionRate) / 1000));  //佣金
+            log::info("=======min_normal_price====={$groupPrice}==========={$commissionRate}===");
+            $commission = sprintf('%.2f', (($groupPrice * $commissionRate) /1000));  //佣金
             //将佣金根据用户等级转成积分
             //$userCommissionIntegral = getCommission($userLevel, $commission);
 
-            // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
+//             $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
 
-            $pv=$commission* 0.5;  //PV
-            $yanglaojin=$pv*0.05; //新的养老金
+            $pv=sprintf('%.2f',$commission* 0.5);  //PV
+            $yanglaojin=$pv; //新的养老金
             Log::info("养老金：".$yanglaojin);
             // if($yanglaojin < 0.1) {
             //     continue;
@@ -235,8 +241,8 @@ class TaoKe extends BaseController
                     //'desc' => $goods['goods_desc'],
                     'coupon_money' => $couponMoney,
                     //'market_price' => $groupPrice,
-                    'market_price' => set_price_rtrim(sprintf('%.2f', $groupPrice - $couponMoney)),
-                    'price' => set_price_rtrim(sprintf('%.2f', $min_normal_price - $couponMoney)),
+                    'market_price' => set_price_rtrim(sprintf('%.2f', $min_normal_price - $couponMoney)),
+                    'price' => set_price_rtrim(sprintf('%.2f', $groupPrice - $couponMoney)),
     
                     'shopName'=>$goods['mall_name'], //店铺名称
                     'monthSales'=>$goods['sales_tip']>0?$goods['sales_tip']:mt_rand(100,10000) //月销量
@@ -413,12 +419,12 @@ class TaoKe extends BaseController
         if (empty($detail)) {//不能请求到数据将结果返回
             return ['code' => 0, 'data' => $result];
         }
-        $commission = ($detail['min_group_price'] * $detail['promotion_rate']) / 1000 / 100;
+        $commission = sprintf('%.2f',($detail['min_group_price'] * $detail['promotion_rate']) / 1000 / 100);
         // $detail['yanglao'] = app()->make(ProductRepository::class)
         //     ->thirdYanglaojin(0, sprintf('%.2f', $commission));
         
-            $pv=$commission* 0.5;  //PV
-            $yanglaojin=$pv*0.05; //新的养老金
+            $pv=sprintf('%.2f', $commission *0.5);  //PV
+            $yanglaojin=$pv; //新的养老金
         
         $gongxian=$pv;
         $jifen=$pv;

app/controller/api/store/product/Vip.php

@@ -171,7 +171,7 @@ class Vip extends BaseController
                     $commission = $goods['commission'];
 
                     $pv=$commission* 0.5;  //PV
-                    $yanglaojin=$pv*0.05; //新的养老金
+                    $yanglaojin=$pv; //新的养老金
 
 
                     // $yanglaojin = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
@@ -212,7 +212,7 @@ class Vip extends BaseController
                     Db::name("third_party_goods")->insert([
                         'json' => json_encode($goods, JSON_UNESCAPED_UNICODE),
                         'type' => 5,
-                        'pension' => $yanglaojin,
+                        'pension' => $commission,
                         'cid'=>$cid //一级分类
                     ]);
 
@@ -534,7 +534,7 @@ class Vip extends BaseController
 
         $commission=$result['result'][0]['vipPrice'] * $result['result'][0]['commissionRate'] / 100 ; //佣金(预估)
         $pv=$commission* 0.5;  //PV
-        $yanglaojin=$pv*0.05; //新的养老金
+        $yanglaojin=$pv; //新的养老金
 
         $gongxian=$pv; //新的养老金
         $jifen=$pv; //新的养老金

app/controller/api/user/User.php

@@ -219,11 +219,13 @@ class User extends BaseController
     //贡献值
 
     public function  gongxian_info(){
-        log::info("============hongbao");
+        log::info("============gongxianinfo");
         $user = $this->request->userInfo();
         if($user->uid>0){
+
+//            $dateObj=DB::name('user_sign_hongbao')->where('uid', $user->uid)->select();
             //已经入账贡献值
-            $data['total_source']=$user->gongxian;
+            $data['total_source']=$user->contribute;
             //为生贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');;
             log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
@@ -242,14 +244,14 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-        }
-        if($pm==1){
-            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
+//        if($pm==1){
+//            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+//
+//        }
         if($pm==2){
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', -1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         log::info("=======date==={$data}");
@@ -1488,41 +1490,247 @@ class User extends BaseController
         return app("json")->fail("未绑定");
     }
 
+//    /*
+//     * 养老金统计
+//     * */
+//    public function get_yanglao_statistics()
+//    {
+//        $uid = $this->request->uid();
+//        //线下数量
+//        // 查询未结算
+//
+//        $gzc_order_list = Db::name('gzc_logs')->where('uid', $uid)->column('out_trade_no');
+//
+//        $onlineYanglaoUserBill = Db::name('user_bill')->where('commission_type', 5)->whereNotIn('order_sn',$gzc_order_list)->where('status', 0)->where('uid', $uid)->sum('number');
+//        $onlineYanglaoGzc = Db::name('gzc_logs')->where('success', 0)->where('uid', $uid)->sum('pension');
+//        $clearYanglao = Db::name('gzc_logs')->where('success', 1)->where('uid', $uid)->sum('pension');
+//
+//        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card')->find();
+//        $res = GzcApiRequest::checkAmount($userInfo);
+//        $gzc = $res['extendData']['amount'] * 0.01;
+//        // PCPC-中信公证处
+//        $data['all_gzc'] = set_price_rtrim(sprintf("%01.2f", $gzc));
+//        // 总养老金
+//        $data['all_yanglao'] = set_price_rtrim($onlineYanglaoUserBill + $onlineYanglaoGzc + $clearYanglao + $gzc);
+//        // 平台养老金
+//        $data['all_yanglao_yhc'] = set_price_rtrim($onlineYanglaoUserBill + $onlineYanglaoGzc + $clearYanglao);
+//        // 未结算养老金=预估养老金，不能包含进入公证处未成功的记录(这部分是已结算的)
+//        $data['all_yanglao_yugu'] = set_price_rtrim(round($onlineYanglaoUserBill, 2));
+//        // 已结算养老金 已入账
+//        $data['all_yanglao_clear'] = set_price_rtrim(round($onlineYanglaoGzc+$clearYanglao, 2));
+//        // 已入账养老金
+//        $data['all_yanglao_in'] = set_price_rtrim(round($clearYanglao, 2));
+//        // 平台未入账养老金
+//        $data['all_yanglao_nclear'] = set_price_rtrim(round($onlineYanglaoGzc + $onlineYanglaoUserBill, 2));
+//        // 待发起
+//        $data['all_yanglao_wait'] = set_price_rtrim(round($onlineYanglaoGzc, 2));
+//
+//        return app("json")->success("查询成功", $data);
+//    }
+
     /*
-     * 养老金统计
-     * */
+        * 养老金统计
+        * */
     public function get_yanglao_statistics()
     {
         $uid = $this->request->uid();
         //线下数量
-        // 查询未结算
+        $offLine = \think\facade\Db::name('order_merchant')->where('uid', $uid)->where('status', 1)->field('pension yanglao')->select()->toArray();
+        $data['offLine'] = array(
+            'num' => count($offLine),
+            'yanglao' => round($this->num($offLine, 'yanglao'), 2)
+        );
+        $offLinewhere=['uid'=>$uid,'status'=>'1','commission_type' => '5','source'=>1,'type_shop'=>0];
+        if($this->source=='yhc' && $this->merId){
+            $offLinewhere['mer_id']=$this->merId;
+        }
+        $offLine= \think\facade\Db::name('user_bill')->where($offLinewhere)->select()->toArray();
+        $data['offLine'] = array(
+            'num' => count($offLine),
+            'yanglao' => round($this->num($offLine, 'number'), 2)
+        );
+//        $offLinewhere=['uid'=>$uid,'status'=>'1','commission_type' => '5','source'=>0,'type_shop'=>0];
+//        $offLine= \think\facade\Db::name('user_bill')->where($offLinewhere)->select()->toArray();
+//        $data['offLine'] = array(
+//            'num' => count($offLine),
+//            'yanglao' => round($this->num($offLine, 'number'), 2)
+//        );
+        //线上已确认收货
+//        $onLine = \think\facade\Db::name('store_order')->where('uid', $uid)->where('paid', 1)->where('status', 'in', '2,3')->select()
+//            ->each(function ($item) {
+//                //查询养老金金额
+//                $UserBillRepository = app()->make(UserBillRepository::class);
+//                $bill = $UserBillRepository->getWhere(['uid' => $item['uid'], 'link_id' => $item['order_id'], 'order_sn' => $item['order_sn'], 'title' => '养老金']);
+//                $pension = $bill->number ?? 0;
+//                $item['yanglao'] = $pension;
+//                return $item;
+//            })
+//            ->toArray();
+
+        $onLinewhere=['uid'=>$uid,'status'=>'1','commission_type' => '5','source'=>0,'type_shop'=>0];
+        if($this->source=='yhc' && $this->merId){
+            $onLinewhere['mer_id']=$this->merId;
+        }
+        $onLine= \think\facade\Db::name('user_bill')->where($onLinewhere)->select()->toArray();
+        $data['onLine'] = array(
+            'num' => count($onLine),
+            'yanglao' => round($this->num($onLine, 'number'), 2)
+        );
+        //线上未确认收货
+//        $onLine = \think\facade\Db::name('store_order')->where('uid', $uid)->where('paid', 1)->where('status', 'in', '0,1')->select()
+//            ->each(function ($item) {
+//                //查询养老金金额
+//                $UserBillRepository = app()->make(UserBillRepository::class);
+//                $bill = $UserBillRepository->getWhere(['uid' => $item['uid'], 'link_id' => $item['order_id'], 'order_sn' => $item['order_sn'], 'title' => '养老金']);
+//                $pension = $bill->number ?? 0;
+//                $item['yanglao'] = $pension;
+//                return $item;
+//            })
+//            ->toArray();
+        $onLine_take_nowhere=['uid'=>$uid,'status'=>'0','commission_type' => '5','source'=>0,'type_shop'=>0];
+        if($this->source=='yhc' && $this->merId){
+            $onLine_take_nowhere['mer_id']=$this->merId;
+        }
+        $onLine_take_no=\think\facade\Db::name('user_bill')->where($onLine_take_nowhere)->select()->toArray();
+        $data['onLine_take_no'] = array(
+            'num' => count($onLine_take_no),
+            'yanglao' => round($this->num($onLine_take_no, 'number'), 2)
+        );
+        if($this->source=='yhc' && $this->merId){
+            $data['all_num'] = $data['offLine']['num'] +$data['onLine_take_no']['num'] + $data['onLine']['num'];
+            $data['all_yanglao_yhc'] = set_price_rtrim(round($data['offLine']['yanglao']+$data['onLine']['yanglao'] + $data['onLine_take_no']['yanglao'] , 2));//总养老金
+            $data['all_yanglao_a'] = set_price_rtrim(round($data['offLine']['yanglao'] + $data['onLine']['yanglao'], 2));//已结算养老金
+            $data['all_yanglao_yugu'] = set_price_rtrim(round($data['all_yanglao_yhc']-$data['all_yanglao_a'],2));//预估养老金
 
-        $gzc_order_list = Db::name('gzc_logs')->where('uid', $uid)->column('out_trade_no');
+            $userInfo = Db::name('UserCertification') -> where('uid',$uid) -> field('user_name,user_card') -> find();
+            $res = GzcApiRequest::checkAmount($userInfo);
+            $data['all_gzc']=set_price_rtrim(sprintf("%01.2f", $res['extendData']['amount'] * 0.01));
+            $data['all_yanglao']=set_price_rtrim( $data['all_yanglao_yhc'] + $data['all_gzc']);
 
-        $onlineYanglaoUserBill = Db::name('user_bill')->where('commission_type', 5)->whereNotIn('order_sn',$gzc_order_list)->where('status', 0)->where('uid', $uid)->sum('number');
-        $onlineYanglaoGzc = Db::name('gzc_logs')->where('success', 0)->where('uid', $uid)->sum('pension');
-        $clearYanglao = Db::name('gzc_logs')->where('success', 1)->where('uid', $uid)->sum('pension');
+            return app("json")->success("查询成功", $data);
+        }
 
-        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card')->find();
-        $res = GzcApiRequest::checkAmount($userInfo);
-        $gzc = $res['extendData']['amount'] * 0.01;
-        // PCPC-中信公证处
-        $data['all_gzc'] = set_price_rtrim(sprintf("%01.2f", $gzc));
-        // 总养老金
-        $data['all_yanglao'] = set_price_rtrim($onlineYanglaoUserBill + $onlineYanglaoGzc + $clearYanglao + $gzc);
-        // 平台养老金
-        $data['all_yanglao_yhc'] = set_price_rtrim($onlineYanglaoUserBill + $onlineYanglaoGzc + $clearYanglao);
-        // 未结算养老金=预估养老金，不能包含进入公证处未成功的记录(这部分是已结算的)
-        $data['all_yanglao_yugu'] = set_price_rtrim(round($onlineYanglaoUserBill, 2));
-        // 已结算养老金 已入账
-        $data['all_yanglao_clear'] = set_price_rtrim(round($onlineYanglaoGzc+$clearYanglao, 2));
-        // 已入账养老金
-        $data['all_yanglao_in'] = set_price_rtrim(round($clearYanglao, 2));
-        // 平台未入账养老金
-        $data['all_yanglao_nclear'] = set_price_rtrim(round($onlineYanglaoGzc + $onlineYanglaoUserBill, 2));
-        // 待发起
-        $data['all_yanglao_wait'] = set_price_rtrim(round($onlineYanglaoGzc, 2));
+        //淘宝
+        $tb_a = 0;
+        $tb_where=['uid'=>$uid,'commission_type' => '5','source'=>0,'type_shop'=>5];
+        $tb = \think\facade\Db::name('user_bill')->where('uid', $uid)->where($tb_where)->where('status','<>','-1')->select()->each(function ($value) use (&$tb_a) {
+            $value['yanglao'] = 0;
+            $value['yanglao'] = $value['number'];
+            $value['yanglao_a'] = 0;
+            if ($value['status'] == 1) {
+                $value['yanglao_a'] = $value['yanglao'];
+                $tb_a++;
+            }
+            return $value;
+        })->toArray();
+        $data['tb'] = array(
+            'num' => count($tb),
+            'num_a' => $tb_a,
+            'yanglao' => round($this->num($tb, 'yanglao'), 2),
+            'yanglao_a' => round($this->num($tb, 'yanglao_a'), 2),
+        );
+        //京东
+        $jd_a = 0;
+        $jd_where=['uid'=>$uid,'commission_type' => '5','source'=>0,'type_shop'=>6];
+        $jd = \think\facade\Db::name('user_bill')->where('uid', $uid)->where($jd_where)->where('status','<>','-1')->select()->each(function ($value) use (&$jd_a) {
+            $value['yanglao'] = 0;
+            $value['yanglao'] = $value['number'];
+            $value['yanglao_a'] = 0;
+            if ($value['status'] == 1) {
+                $value['yanglao_a'] = $value['yanglao'];
+                $jd_a++;
+            }
+            return $value;
+        })->toArray();
+        $data['jd'] = array(
+            'num' => count($jd),
+            'num_a' => $jd_a,
+            'yanglao' => round($this->num($jd, 'yanglao'), 2),
+            'yanglao_a' => round($this->num($jd, 'yanglao_a'), 2),
+        );
+        //苏宁
+        $su_a = 0;
+        $su_where=['uid'=>$uid,'commission_type' => '5','source'=>0,'type_shop'=>3];
+        $su = \think\facade\Db::name('user_bill')->where('uid', $uid)->where($su_where)->where('status','<>','-1')->select()->each(function ($value) use (&$su_a) {
+            $value['yanglao'] = 0;
+            $value['yanglao'] = $value['number'];
+            $value['yanglao_a'] = 0;
+            if ($value['status'] == 1) {
+                $value['yanglao_a'] = $value['yanglao'];
+                $su_a++;
+            }
+            return $value;
+        })->toArray();
+        $data['su'] = array(
+            'num' => count($su),
+            'num_a' => $su_a,
+            'yanglao' => round($this->num($su, 'yanglao'), 2),
+            'yanglao_a' => round($this->num($su, 'yanglao_a'), 2),
+        );
+        //拼多多
+        $pdd_a = 0;
+        $pdd_where=['uid'=>$uid,'commission_type' => '5','source'=>0,'type_shop'=>1];
+        $pdd = \think\facade\Db::name('user_bill')->where('uid', $uid)->where($pdd_where)->where('status','<>','-1')->select()->each(function ($value) use (&$pdd_a) {
+            $value['yanglao'] = 0;
+            $value['yanglao'] = $value['number'];
+            $value['yanglao_a'] = 0;
+            if ($value['status'] == 1) {
+                $value['yanglao_a'] = $value['yanglao'];
+                $pdd_a++;
+            }
+            return $value;
+        })->toArray();
+        $data['pdd'] = array(
+            'num' => count($pdd),
+            'num_a' => $pdd_a,
+            'yanglao' => round($this->num($pdd, 'yanglao'), 2),
+            'yanglao_a' => round($this->num($pdd, 'yanglao_a'), 2),
+        );
+        //唯品会
+        $vip_a = 0;
+        $vip_where=['uid'=>$uid,'commission_type' => '5','source'=>0,'type_shop'=>2];
+        $vip = \think\facade\Db::name('user_bill')->where($vip_where)->where('uid', $uid)->where('status','<>','-1')->select()->each(function ($value) use (&$vip_a) {
+            $value['yanglao'] = 0;
+            $value['yanglao'] = $value['number'];
+            $value['yanglao_a'] = 0;
+            if ($value['status'] == 1) {
+                $value['yanglao_a'] = $value['yanglao'];
+                $vip_a++;
+            }
+            return $value;
+        })->toArray();
+        $data['vip'] = array(
+            'num' => count($vip),
+            'num_a' => $vip_a,
+            'yanglao' => round($this->num($vip, 'yanglao'), 2),
+            'yanglao_a' => round($this->num($vip, 'yanglao_a'), 2),
+        );
+        // 抖音
+        $dy_a = 0;
+        $dy_where=['uid'=>$uid,'commission_type' => '5','source'=>0,'type_shop'=>9];
+        $dy = \think\facade\Db::name('user_bill')->where('uid', $uid)->where($dy_where)->where('status','<>','-1')->select()->each(function ($value) use (&$dy_a) {
+            $value['yanglao'] = 0;
+            $value['yanglao'] = $value['number'];
+            $value['yanglao_a'] = 0;
+            if ($value['status'] == 1) {
+                $value['yanglao_a'] = $value['yanglao'];
+                $dy_a++;
+            }
+            return $value;
+        })->toArray();
+        $data['dy'] = array(
+            'num' => count($dy),
+            'num_a' => $dy_a,
+            'yanglao' => round($this->num($dy, 'yanglao'), 2),
+            'yanglao_a' => round($this->num($dy, 'yanglao_a'), 2),
+        );
 
+        $data['all_num'] = $data['offLine']['num'] +$data['onLine_take_no']['num'] + $data['onLine']['num'] + $data['tb']['num'] + $data['jd']['num'] + $data['su']['num'] + $data['pdd']['num'] + $data['vip']['num'] + $data['dy']['num'];
+        $data['all_yanglao'] = round($data['offLine']['yanglao']+$data['onLine']['yanglao'] + $data['onLine_take_no']['yanglao'] + $data['tb']['yanglao'] + $data['jd']['yanglao'] + $data['su']['yanglao'] + $data['pdd']['yanglao'] + $data['vip']['yanglao'] + $data['dy']['yanglao'], 2);
+        $data['all_yanglao_a'] = round($data['offLine']['yanglao'] + $data['onLine']['yanglao'] + $data['tb']['yanglao_a'] + $data['jd']['yanglao_a'] + $data['su']['yanglao_a'] + $data['pdd']['yanglao_a'] + $data['vip']['yanglao_a'] + $data['dy']['yanglao_a'], 2);
+        $data['third_party_num']=['all_num'=>$data['tb']['num']+$data['jd']['num']+$data['su']['num']+ $data['pdd']['num'] + $data['vip']['num']+ $data['dy']['num']];
+        $data['third_party_num_a']=['all_num_a'=>$data['tb']['num_a']+$data['jd']['num_a']+$data['su']['num_a']+ $data['pdd']['num_a'] + $data['vip']['num_a']+ $data['dy']['num_a']];
+        $data['third_party_num_n']=['all_num_n'=>$data['third_party_num']['all_num']-$data['third_party_num_a']['all_num_a']];
         return app("json")->success("查询成功", $data);
     }
 
@@ -1608,7 +1816,7 @@ class User extends BaseController
     //20220712版签到
     public function new_sign()
     {
-        return app('json')->fail('不允许签到');
+//        return app('json')->fail('不允许签到');
         $uid = $this->request->uid();//签到用户
         $user = Db::name('user')->where('uid', $uid)->field("spread_uid,first_sign")->find();//上级用户
 

route/api.php

@@ -300,8 +300,8 @@ Route::group('api/', function () {
 
             Route::get('hongbao_info','User/hongbao_list');//红包
             Route::get('hongbao_list','User/hongbao_list');//红包记录
-            Route::get('gongxian_info','User/hongbao_list');//贡献
-            Route::get('gongxian_list','User/hongbao_list');//贡献记录
+            Route::get('gongxian_info','User/gongxian_info');//贡献
+            Route::get('gongxian_list','User/gongxian_list');//贡献记录
             Route::get('fugou_info','User/fugou_list');//复购金
             Route::get('fugou_list','User/fugou_list');//复购金记录
             Route::get('jingdou_info','User/jingdou_list');//京豆