调整页面限å显示问题

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

@@ -344,7 +344,11 @@ class StoreRefundOrderRepository extends BaseRepository
      */
     public function getList(array $where, int $page, int $limit,$status)
     {
-        if($status == 2) $where['status'] = '1,2';
+        if($status == 2){
+            $where['status'] = '1,2';
+        }else{
+            $where['status'] = $status;
+        }
         $query = $this->dao->search($where)->where('is_system_del', 0)->with(['order' => function ($query) {
             $query->field('order_id,order_sn,douhuomall');
         }, 'refundProduct.product', 'user' => function ($query) {

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

@@ -161,14 +161,18 @@ class Other extends BaseController
         //1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么
         switch ($params['type']) {
             case 1://多多进宝
-                $list = Db::name('order_pdd')
-                    ->field('order_pdd_id id,goods_id,goods_sign,order_sn,goods_num,goods_img,goods_name,goods_price,pin_order_status other_status,pin_order_status_desc other_status_desc,order_money,pay_money,create_time,commission,bill_status,bill_end_time')
+                $list = Db::name('user_bill')
+                    ->field('number,order_sn')
                     ->where('uid', $userId)
+                    ->where('commission_type',5)
                     ->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('id', 'desc')
+                    ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()
                     ->each(function ($value) {
+                        $pdd_list = Db::name("order_pdd")->where("order_sn",$value['order_sn'])->field('order_pdd_id id,goods_id,goods_sign,order_sn,goods_num,goods_img,goods_name,goods_price,pin_order_status other_status,pin_order_status_desc other_status_desc,order_money,pay_money,create_time,commission,bill_status,bill_end_time');
+                        $value = array_merge($value,$pdd_list);
+                        $yanglao = $value['number'];
                         $value['source'] = 1;
                         $billEndTime = $value['bill_end_time'];
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
@@ -176,10 +180,6 @@ class Other extends BaseController
                         $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $statusName[$value['bill_status']];
                         $commission = $value['commission'];
-                        $yanglao = 0;
-                        if ($commission) {
-                            $yanglao = Db::name("user_bill") -> where("order_sn",$value['order_sn']) -> value("number");
-                        }
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
@@ -188,14 +188,18 @@ class Other extends BaseController
                     });
                 break;
             case 2://唯品会(没有商品价格)
-                $list = Db::name('order_vip')
-                    ->field('order_vip_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,order_status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_money')
+                $list = Db::name('user_bill')
+                    ->field('number,order_sn')
                     ->where('uid', $userId)
+                    ->where('commission_type',5)
                     ->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('id', 'desc')
+                    ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()
                     ->each(function ($value) {
+                        $vip_list = Db::name("order_vip")->where("order_sn",$value['order_sn'])->field('order_vip_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,order_status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_money');
+                        $value = array_merge($value,$vip_list);
+                        $yanglao = $value['number'];
                         $value['source'] = 2;
                         $billEndTime = $value['bill_end_time'];
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
@@ -203,10 +207,6 @@ class Other extends BaseController
                         $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $statusName[$value['bill_status']];
                         $commission = $value['commission'];
-                        $yanglao = 0;
-                        if ($commission) {
-                            $yanglao = Db::name("user_bill") -> where("order_sn",$value['order_sn']) -> value("number");
-                        }
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
@@ -215,14 +215,18 @@ class Other extends BaseController
                     });
                 break;
             case 3://苏宁订单列表
-                $list = Db::name('order_su')
-                    ->field('order_su_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_amount')
+                $list = Db::name('user_bill')
+                    ->field('number,order_sn')
                     ->where('uid', $userId)
+                    ->where('commission_type',5)
                     ->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('id', 'desc')
+                    ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()
                     ->each(function ($value) {
+                        $su_list = Db::name("order_su")->where("order_sn",$value['order_sn'])->field('order_su_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_amount');
+                        $value = array_merge($value,$su_list);
+                        $yanglao = $value['number'];
                         $value['source'] = 3;
                         $billEndTime = $value['bill_end_time'];
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
@@ -230,10 +234,6 @@ class Other extends BaseController
                         $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $statusName[$value['bill_status']];
                         $commission = $value['commission'];
-                        $yanglao = 0;
-                        if ($commission) {
-                            $yanglao = Db::name("user_bill") -> where("order_sn",$value['order_sn']) -> value("number");
-                        }
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
@@ -242,14 +242,18 @@ class Other extends BaseController
                     });
                 break;
             case 5://淘宝客
-                $list = Db::name('order_tb')
-                    ->field('order_tb_id id,item_id goods_id,order_sn,item_num goods_num,item_img goods_img,item_title goods_name,item_price goods_price,tk_status,create_time,commission,commission_rate,alipay_total_price pay_money,bill_status,bill_end_time')
+                $list = Db::name('user_bill')
+                    ->field('number,order_sn')
                     ->where('uid', $userId)
+                    ->where('commission_type',5)
                     ->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('id', 'desc')
+                    ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()
                     ->each(function ($value) {
+                        $tb_list = Db::name("order_tb")->where("order_sn",$value['order_sn'])->field('order_tb_id id,item_id goods_id,order_sn,item_num goods_num,item_img goods_img,item_title goods_name,item_price goods_price,tk_status,create_time,commission,commission_rate,alipay_total_price pay_money,bill_status,bill_end_time');
+                        $value = array_merge($value,$tb_list);
+                        $yanglao = $value['number'];
                         $otherStatus = $value['tk_status'];
                         $value['other_status_desc'] = TbOrderModel::$statusName[$otherStatus] ?? '未知类型';
                         $value['source'] = 5;
@@ -262,10 +266,6 @@ class Other extends BaseController
                         if ($commission == 0) {
                             $commission = sprintf('%.2f', $value['commission_rate'] * $value['pay_money'] / 100);
                         }
-                        $yanglao = 0;
-                        if ($commission) {
-                            $yanglao = Db::name("user_bill") -> where("order_sn",$value['order_sn']) -> value("number");
-                        }
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
@@ -277,14 +277,18 @@ class Other extends BaseController
                     });
                 break;
             case 6://京东订单
-                $list = Db::name('order_jd')
-                    ->field('order_jd_id id,sku_id goods_id,order_sn,sku_num goods_num,image_url goods_img,sku_name goods_name,pay_money,price goods_price,status,create_time,commission,bill_status,bill_end_time')
+                $list = Db::name('user_bill')
+                    ->field('number,order_sn')
                     ->where('uid', $userId)
+                    ->where('commission_type',5)
                     ->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('id', 'desc')
+                    ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()
                     ->each(function ($value) {
+                        $jd_list = Db::name("order_jd")->where("order_sn",$value['order_sn'])->field('order_jd_id id,sku_id goods_id,order_sn,sku_num goods_num,image_url goods_img,sku_name goods_name,pay_money,price goods_price,status,create_time,commission,bill_status,bill_end_time');
+                        $value = array_merge($value,$jd_list);
+                        $yanglao = $value['number'];
                         $otherStatus = $value['status'];
                         $value['other_status_desc'] = JdOrderModel::$statusName[$otherStatus] ?? '未知订单状态';
                         $value['source'] = 6;
@@ -294,10 +298,6 @@ class Other extends BaseController
                         $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $statusName[$value['bill_status']];
                         $commission = $value['commission'];
-                        $yanglao = 0;
-                        if ($commission) {
-                            $yanglao = Db::name("user_bill") -> where("order_sn",$value['order_sn']) -> value("number");
-                        }
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
@@ -306,14 +306,18 @@ class Other extends BaseController
                     });
                 break;
             case 9: //抖音
-                $list = Db::name('order_dy')
-                    ->field('order_dy_id id,product_id goods_id,order_sn,product_num goods_num,product_img goods_img,product_name goods_name,commission,total_pay_amount pay_money,bill_status,bill_end_time,create_time,flow_point status,pay_success_time')
+                $list = Db::name('user_bill')
+                    ->field('number,order_sn')
                     ->where('uid', $userId)
+                    ->where('commission_type',5)
                     ->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('id', 'desc')
+                    ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()
                     ->each(function ($value) {
+                        $dy_list = Db::name("order_dy")->where("order_sn",$value['order_sn'])->field('order_dy_id id,product_id goods_id,order_sn,product_num goods_num,product_img goods_img,product_name goods_name,commission,total_pay_amount pay_money,bill_status,bill_end_time,create_time,flow_point status,pay_success_time')->find();
+                        $value = array_merge($value,$dy_list);
+                        $yanglao = $value['number'];
                         $otherStatus = $value['status'];
                         $value['other_status_desc'] = DyOrderModel::$statusName[$otherStatus] ?? '未知订单状态';
                         $value['source'] = 9;
@@ -323,10 +327,6 @@ class Other extends BaseController
                         $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $statusName[$value['bill_status']];
                         $commission = $value['commission'];
-                        $yanglao = 0;
-                        if ($commission) {
-                            $yanglao = Db::name("user_bill") -> where("order_sn",$value['order_sn']) -> value("number");
-                        }
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
                         }
@@ -335,14 +335,17 @@ class Other extends BaseController
                     });
                 break;
             case 10: //话费
-                $list = Db::name('order_huafei')
-                    ->field('order_huafei_id id,order_sn,commission,amount_price pay_money,bill_status,bill_end_time,create_time,finish_time')
+                $list = Db::name('user_bill')
+                    ->field('number,order_sn')
                     ->where('uid', $userId)
+                    ->where('commission_type',5)
                     ->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('id', 'desc')
+                    ->order('bill_id', 'desc')
                     ->page($page, $limit)->select()
                     ->each(function ($value) {
+                        $huafei_list = Db::name("order_huafei")->where("order_sn",$value['order_sn'])->field('order_huafei_id id,order_sn,commission,amount_price pay_money,bill_status,bill_end_time,create_time,finish_time')->find();
+                        $value = array_merge($value,$huafei_list);
                         $value['source'] = 10;
                         $billEndTime = $value['bill_end_time'];
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
@@ -350,10 +353,7 @@ class Other extends BaseController
                         $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $statusName[$value['bill_status']];
                         $commission = $value['commission'];
-                        $yanglao = 0;
-                        if ($commission) {
-                            $yanglao = Db::name("user_bill")->where("order_sn",$value['order_sn']) -> value("number");
-                        }
+                        $yanglao = $value['number'];
                         if (!$yanglao|| $yanglao <= 0){
                             $systemvalueObj = Db::name('system_config_value')->where('config_key','sanfangfenpei')->find();
                             $sanfangfenpei=json_decode($systemvalueObj['value'],true);

app/controller/merchant/store/order/RefundOrder.php

@@ -44,7 +44,7 @@ class RefundOrder extends BaseController
     {
         list($page,$limit) = $this->getPage();
         $where = $this->request->params(['refund_order_sn','refund_type','date','order_sn']);
-        $status = $this->request->params('status');
+        $status = $this->request->param('status');
         $where['mer_id'] = $this->request->merId();
         return app('json')->success($this->repository->getList($where,$page,$limit,$status));
     }