总部后台线下订单展示和导出-修复导出问题

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -154,74 +154,28 @@ class OrderMerchantRepository extends BaseRepository
      */
     public function getMerchantListAdmin($merId, array $where, $page, $limit)
     {
-//        $merId=Db::name('merchant')->where('uid',$uid)->value('mer_id');
+        //        $merId=Db::name('merchant')->where('uid',$uid)->value('mer_id');
         $query = $this->dao->merchantSearch($merId, $where);
         $query1 = $this->dao->merchantSearch($merId, $where);
         $statistics = $query1->field('sum(money) money,sum(available) available,sum(swipe_fee) swipe_fee')
-            ->when($merId, function ($query, $merId) {
-                $query->where('mer_id', $merId);
-            })
+            ->where('mer_id', $merId)
             ->where('paid', 1)
             ->whereNull('refund_time')
             ->find();
-
-        $is_excel = request()->param('is_excel', 0);
-        if($is_excel){
-            ini_set('memory_limit', '-1');
-            set_time_limit(0);
-            $list = clone $query;
-            $list = $list->with(['merchant' => function ($query) {
-                return $query->field('mer_id,mer_name,mer_avatar');
-            }])->order('id desc')->select()->each(function ($item) {
-                $item->actual = bcsub($item->money, ($item->available + $item->swipe_fee), 2);
-                return $item;
-            });
-
-            $arr = [];
-            foreach ($list as $item){
-                $status = $item['paid'] == 1 ? '已支付' : '未支付';
-                if($item['refund_time']) $status = '已退款';
-
-                $arr[] = [
-                    $item['id'],
-                    $item['mer_id'],
-                    $item['merchant']['mer_name'] ?? '',
-                    $item['uid'],
-                    $item['money'],
-                    $item['available'],
-                    $item['service_money'],
-                    $item['pension'],
-                    $item['swipe_fee'],
-                    $item['mer_money'],
-                    $item['mer_fanyong'],
-                    $item['actual'],
-                    $status,
-                    $item['create_time'],
-                    $item['out_trade_no']
-                ];
-            }
-            $header = [
-                'ID', '商户ID', '商户名称', '用户ID',
-                '充值金额', '可分佣总额', '服务商返利', '养老金', '刷卡手续费', '商户金额', '商户返佣', '实到金额',
-                '状态', '时间', '订单号'
-            ];
-            return app()->make(\crmeb\services\SpreadsheetExcelService::class)->setExcelContent($header, $arr, '线下订单');
-        }
-
         $count = $query->count();
         $list = $query->with(['merchant', 'merchant' => function ($query) {
             return $query->field('mer_id,mer_name,mer_avatar');
         }])->page($page, $limit)->select()->each(function ($item) {
             $item->actual = bcsub($item->money, ($item->available + $item->swipe_fee), 2);
-//            switch($item->trade_type) {
-//                case 'ALI':
-//                    $item->broadcast = '支付宝收款'.$item->actual.'元';
-//                    break;
-//                case 'WX':
-//                    $item->broadcast = '微信收款'.$item->actual.'元';
-//                    break;
-//                default:break;
-//            }
+            //            switch($item->trade_type) {
+            //                case 'ALI':
+            //                    $item->broadcast = '支付宝收款'.$item->actual.'元';
+            //                    break;
+            //                case 'WX':
+            //                    $item->broadcast = '微信收款'.$item->actual.'元';
+            //                    break;
+            //                default:break;
+            //            }
             //语音内容
             $broadcast = systemConfig('broadcast');
             $item->broadcast = strtr($broadcast, ['{money}' => $item->actual]);

app/controller/admin/order/MerchantOfflineOrder.php

@@ -3,6 +3,7 @@
 namespace app\controller\admin\order;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
 use crmeb\basic\BaseController;
+use crmeb\services\SpreadsheetExcelService;
 use think\App;
 
 class MerchantOfflineOrder extends BaseController
@@ -36,7 +37,68 @@ class MerchantOfflineOrder extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['keyword', 'date', 'status', 'mer_id']);
-        return app('json')->success($this->repository->getMerchantListAdmin($this->merId, $where, $page, $limit));
+        $is_excel = $this->request->param('is_excel', 0);
+        $data = $this->repository->getMerchantListAdmin($this->merId, $where, $page, $limit);
+
+        if($is_excel){
+            $arr = [];
+            foreach ($data as $item){
+                $status = $item['paid'] == 1 ? '已支付' : '未支付';
+                if($item['refund_time']) $status = '已退款';
+
+                $arr[] = [
+                    $item['id'],
+                    $item['mer_id'],
+                    $item['merchant']['mer_name'] ?? '',
+                    $item['uid'],
+                    $item['money'],
+                    $item['available'],
+                    $item['service_money'],
+                    $item['pension'],
+                    $item['swipe_fee'],
+                    $item['mer_money'],
+                    $item['mer_fanyong'],
+                    $item['actual'],
+                    $status,
+                    $item['create_time'],
+                    $item['out_trade_no']
+                ];
+            }
+            $header = [
+                'ID', '商户ID', '商户名称', '用户ID',
+                '充值金额', '可分佣总额', '服务商返利', '养老金', '刷卡手续费', '商户金额', '商户返佣', '实到金额',
+                '状态', '时间', '订单号'
+            ];
+            return app('json')->success($this->getStatisticsExcel($header, $arr, '线下订单'));
+        }
+        return app('json')->success($data);
     }
 
+    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='offline_order';
+        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;
+    }
 }