更新

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

@@ -344,12 +344,15 @@ class StoreRefundOrderRepository extends BaseRepository
      */
     public function getList(array $where, int $page, int $limit,$status)
     {
+        $query = $this->dao->search($where)->where('is_system_del', 0);
         if($status == 2){
-            $where['status'] = '1,2';
+            $query->where([['status','in','1,2']]);
+        }else if($status == 3){
+            $query->where([['status','in','-1,3']]);
         }else{
-            $where['status'] = $status;
+            $query->where([['status','=',$status]]);
         }
-        $query = $this->dao->search($where)->where('is_system_del', 0)->with(['order' => function ($query) {
+        $query->with(['order' => function ($query) {
             $query->field('order_id,order_sn,douhuomall');
         }, 'refundProduct.product', 'user' => function ($query) {
             $query->field('uid,nickname,phone');
@@ -361,7 +364,7 @@ class StoreRefundOrderRepository extends BaseRepository
             'audit' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 0]),
             'refuse' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => -1]),
             'agree' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 1]),
-            'backgood' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => '1,2']),
+            'backgood' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => array(1,2)]),
             'end' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 3]),
 
 

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

@@ -168,9 +168,13 @@ 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()
-                    ->each(function ($value) {
+                    ->page($page, $limit)->select()->toArray();
+                foreach ($list as $k => &$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');
+                        if(!$pdd_list){
+                            unset($list[$k]);
+                            continue;
+                        }
                         $value = array_merge($value,$pdd_list);
                         $yanglao = $value['number'];
                         $value['source'] = 1;
@@ -185,7 +189,7 @@ class Other extends BaseController
                         }
                         $value['yanglao'] = $yanglao;
                         return $value;
-                    });
+                }
                 break;
             case 2://唯品会(没有商品价格)
                 $list = Db::name('user_bill')
@@ -195,9 +199,13 @@ 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()
-                    ->each(function ($value) {
+                    ->page($page, $limit)->select()->toArray();
+                foreach ($list as $k => &$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');
+                        if(!$vip_list){
+                            unset($list[$k]);
+                            continue;
+                        }
                         $value = array_merge($value,$vip_list);
                         $yanglao = $value['number'];
                         $value['source'] = 2;
@@ -212,7 +220,7 @@ class Other extends BaseController
                         }
                         $value['yanglao'] = $yanglao;
                         return $value;
-                    });
+                }
                 break;
             case 3://苏宁订单列表
                 $list = Db::name('user_bill')
@@ -222,9 +230,13 @@ 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()
-                    ->each(function ($value) {
+                    ->page($page, $limit)->select()->toArray();
+                foreach ($list as $k => &$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');
+                        if(!$su_list){
+                            unset($list[$k]);
+                            continue;
+                        }
                         $value = array_merge($value,$su_list);
                         $yanglao = $value['number'];
                         $value['source'] = 3;
@@ -239,7 +251,7 @@ class Other extends BaseController
                         }
                         $value['yanglao'] = $yanglao;
                         return $value;
-                    });
+                }
                 break;
             case 5://淘宝客
                 $list = Db::name('user_bill')
@@ -249,9 +261,13 @@ 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()
-                    ->each(function ($value) {
+                    ->page($page, $limit)->select()->toArray();
+                foreach ($list as $k => &$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');
+                        if(!$tb_list){
+                            unset($list[$k]);
+                            continue;
+                        }
                         $value = array_merge($value,$tb_list);
                         $yanglao = $value['number'];
                         $otherStatus = $value['tk_status'];
@@ -274,7 +290,7 @@ class Other extends BaseController
                         }
                         $value['yanglao'] = $yanglao;
                         return $value;
-                    });
+                }
                 break;
             case 6://京东订单
                 $list = Db::name('user_bill')
@@ -284,9 +300,13 @@ 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()
-                    ->each(function ($value) {
+                    ->page($page, $limit)->select()->toArray();
+                foreach ($list as $k => &$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');
+                        if(!$jd_list){
+                            unset($list[$k]);
+                            continue;
+                        }
                         $value = array_merge($value,$jd_list);
                         $yanglao = $value['number'];
                         $otherStatus = $value['status'];
@@ -303,7 +323,7 @@ class Other extends BaseController
                         }
                         $value['yanglao'] = $yanglao;
                         return $value;
-                    });
+                }
                 break;
             case 9: //抖音
                 $list = Db::name('user_bill')
@@ -313,9 +333,13 @@ 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()
-                    ->each(function ($value) {
+                    ->page($page, $limit)->select()->toArray();
+                foreach ($list as $k => &$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();
+                        if(!$dy_list){
+                            unset($list[$k]);
+                            continue;
+                        }
                         $value = array_merge($value,$dy_list);
                         $yanglao = $value['number'];
                         $otherStatus = $value['status'];
@@ -332,7 +356,7 @@ class Other extends BaseController
                         }
                         $value['yanglao'] = $yanglao;
                         return $value;
-                    });
+                }
                 break;
             case 10: //话费
                 $list = Db::name('user_bill')
@@ -342,26 +366,29 @@ 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()
-                    ->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) : '';
-                        //'0平台未结算1已结算2失效
-                        $statusName = ['未结算', '已结算', '失效'];
-                        $value['status_name'] = $statusName[$value['bill_status']];
-                        $commission = $value['commission'];
-                        $yanglao = $value['number'];
-                        if (!$yanglao|| $yanglao <= 0){
-                            $systemvalueObj = Db::name('system_config_value')->where('config_key','sanfangfenpei')->find();
-                            $sanfangfenpei=json_decode($systemvalueObj['value'],true);
-                            $yanglao=$commission*$sanfangfenpei['yanglaojin']; //新的养老金
-                        }
-                        $value['yanglao'] = $yanglao;
-                        return $value;
-                    });
+                    ->page($page, $limit)->select()->toArray();
+                foreach ($list as $k => &$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();
+                    if(!$huafei_list){
+                        unset($list[$k]);
+                        continue;
+                    }
+                    $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) : '';
+                    //'0平台未结算1已结算2失效
+                    $statusName = ['未结算', '已结算', '失效'];
+                    $value['status_name'] = $statusName[$value['bill_status']];
+                    $commission = $value['commission'];
+                    $yanglao = $value['number'];
+                    if (!$yanglao|| $yanglao <= 0){
+                        $systemvalueObj = Db::name('system_config_value')->where('config_key','sanfangfenpei')->find();
+                        $sanfangfenpei=json_decode($systemvalueObj['value'],true);
+                        $yanglao=$commission*$sanfangfenpei['yanglaojin']; //新的养老金
+                    }
+                    $value['yanglao'] = $yanglao;
+                }
                 break;
             default:
                 $list = [];