更新

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

@@ -3840,7 +3840,7 @@ class StoreOrderRepository extends BaseRepository
             $yongjinbili = static::getUserGroupRate($sprerdUser["user_group"]);
 
             //计算出佣金
-            $yongjin = $pvfee * $yongjinbili / 100;
+            $yongjin = $pvfee * $yongjinbili;
 
             // 佣金百分之90进入佣金池  佣金百分之10进入复购金
             $tuiguanyongjin = $this->roundOptimize($yongjin * 0.9, 2);

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

@@ -383,7 +383,6 @@ class Other extends BaseController
             list($startTime, $endTime) = explode("-", $date);
         }
 
-
         $userId = $this->uid;
         [$page, $limit] = $this->getPage();
         //1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么
@@ -396,7 +395,8 @@ class Other extends BaseController
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                         $pdd_list = Db::name("order_pdd")
                             ->where("order_sn",$value['order_sn'])
@@ -419,8 +419,8 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
+                $list = array_values($list);
                 break;
             case 2://唯品会(没有商品价格)
                 $list = Db::name('user_bill')
@@ -430,7 +430,8 @@ class Other extends BaseController
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                         $vip_list = Db::name("order_vip")
                             ->where("order_sn",$value['order_sn'])
@@ -453,7 +454,6 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 3://苏宁订单列表
@@ -487,7 +487,6 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 5://淘宝客
@@ -529,7 +528,6 @@ class Other extends BaseController
                             $value['goods_img'] = "http:".$value['goods_img'];
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 6://京东订单
@@ -540,7 +538,8 @@ class Other extends BaseController
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                         $jd_list = Db::name("order_jd")
                             ->where("order_sn",$value['order_sn'])
@@ -565,7 +564,6 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 9: //抖音
@@ -576,7 +574,8 @@ class Other extends BaseController
                     ->where('pay_success_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('pay_success_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                         $dy_list = Db::name("order_dy")
                             ->where("order_sn",$value['order_sn'])
@@ -601,7 +600,6 @@ class Other extends BaseController
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
                         $value['yanglao'] = $yanglao;
-                        return $value;
                 }
                 break;
             case 10: //话费
@@ -612,7 +610,8 @@ class Other extends BaseController
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
                     ->order('bill_id', 'desc')
-                    ->page($page, $limit)->select()->toArray();
+                    ->page($page, $limit)->select();
+                if($list) $list = $list->toArray();
                 foreach ($list as $k => &$value) {
                     $huafei_list = Db::name("order_huafei")
                         ->where("order_sn",$value['order_sn'])
@@ -638,7 +637,6 @@ class Other extends BaseController
                     }
                     $value['yanglao'] = $yanglao;
                 }
-                $list = array_values($list);
                 break;
             default:
                 $list = [];