Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/controller/OrderExchange.php

@@ -4,6 +4,9 @@ namespace app\admin\controller;
 
 use app\admin\logic\OrderExchangeLogic;
 use app\BaseController;
+use think\exception\ValidateException;
+use think\facade\Config;
+use think\facade\Validate;
 
 class OrderExchange extends BaseController
 {
@@ -22,10 +25,22 @@ class OrderExchange extends BaseController
     }
 
     //导出
-    public function export(){}
+    public function export(){
+        $param = $this->request->only(['orderCode'=>'','status' => '', 'name' => '', 'username' => '','start_date'=>'','end_date'=>''], 'post');
+
+        return OrderExchangeLogic::export($param);
+    }
 
     //发货
-    public function out(){
+    public function deliver(){
+
+        $list = $this->request->post('list/a', 'post');
+
+        $val=Validate::rule(['list|发货列表'=>'require|array|length:1,100']);
+
+        if(!$val->check(['list'=>$list])) throw new ValidateException($val->getError());
+
+        return OrderExchangeLogic::deliver($list);
 
     }
 

app/admin/logic/OrderExchangeLogic.php

@@ -4,7 +4,9 @@ namespace app\admin\logic;
 
 use app\model\CommonModel;
 use app\model\OrderExchangeModel;
+use think\Exception;
 use think\facade\Db;
+use think\facade\Validate;
 use think\response\Json;
 
 class OrderExchangeLogic extends BaseLogic
@@ -49,7 +51,6 @@ class OrderExchangeLogic extends BaseLogic
         return json_show(CommonModel::$success, '获取兑换订单列表成功', ['count' => $count, 'list' => $list]);
     }
 
-
     //详情
     public static function read(int $id = 0): Json
     {
@@ -60,7 +61,7 @@ class OrderExchangeLogic extends BaseLogic
             ->leftJoin('account d', 'd.id=a.uid AND d.is_del=' . CommonModel::$del_normal)
             ->leftJoin('addr e', 'e.id=a.addr_id AND e.is_del=' . CommonModel::$del_normal)
             ->leftJoin('good f', 'f.id=a.good_id AND f.is_del=' . CommonModel::$del_normal)
-            ->where('a.is_del', CommonModel::$del_normal)
+            ->where(['a.is_del' => CommonModel::$del_normal, 'a.id' => $id])
             ->withAttr('addr_code', function ($val) {
                 return explode(',', $val);
             })
@@ -76,5 +77,102 @@ class OrderExchangeLogic extends BaseLogic
         return json_show(CommonModel::$success, '获取商品详情成功', $rs);
     }
 
+    //导出
+    public static function export(array $data = []): Json
+    {
+
+        $db = OrderExchangeModel::alias('a')
+            ->leftJoin('company b', 'b.id=a.company_id AND b.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('card c', 'c.id=a.card_id AND c.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('account d', 'd.id=a.uid AND d.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('addr e', 'e.id=a.addr_id AND e.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('good f', 'f.id=a.good_id AND f.is_del=' . CommonModel::$del_normal)->where('a.is_del', CommonModel::$del_normal)
+            ->where('a.is_del', CommonModel::$del_normal);
+
+        if ($data['orderCode'] != '') $db->whereLike('a.orderCode', '%' . $data['orderCode'] . '%');
+        if ($data['status'] != '') $db->where('a.status', $data['status']);
+        if ($data['name'] !== '') $db->whereLike('d.name', '%' . $data['name'] . '%');
+        if ($data['username']) $db->whereLike('d.username', '%' . $data['username'] . '%');
+        if (($data['start_date'] != '') && ($data['end_date'] != '')) $db->whereBetween('a.addtime', [$data['start_date'], $data['end_date']]);
+
+        $status = [OrderExchangeModel::$status_not_deliver => '待发货', OrderExchangeModel::$status_deliver => '已发货', OrderExchangeModel::$status_receipt => '已收货'];
+        $list = $db
+            ->field('a.id 订单ID,a.orderCode 订单编号,b.title 业务公司,c.title 卡类型,d.name 购买用户名,d.username 购买账号,a.num 购买数量,e.contactor 收货联系人,e.mobile 收货联系电话,e.addr_code,a.status 状态,a.post_name 物流公司,a.post_code 物流单号,a.addtime 创建时间,e.addr,f.good_code 商品编码,f.good_name 商品名称')
+            ->order('a.addtime desc')
+            ->cursor();
+
+        $da = [];
+        foreach ($list as $v) {
+            $v = $v->toArray();
+            $area_name = Db::name('area')
+                ->whereIn('code', $v['addr_code'])
+                ->column('name');
+            $v['收货地址'] = implode('', $area_name) . $v['addr'];
+            $v['状态'] = $status[$v['状态']] ?? '';
+
+            unset($v['addr_code']);
+            unset($v['addr']);
+
+            $da[] = $v;
+        }
+
+        if (empty($da)) $da[] = '没有可供导出的数据';
+
+        $headerArr = array_keys($da[0]);
+        excel_save('兑换订单导出' . date('YmdHis'), $headerArr, $da);
+
+    }
+
+    //发货
+    public static function deliver(array $list = [])
+    {
+
+        $db = new OrderExchangeModel();
+        $temp = $db
+            ->field('id,orderCode')
+            ->where(['is_del' => CommonModel::$del_normal])
+            ->where('status', '<>', $db::$status_not_deliver)
+            ->whereIn('orderCode', array_column($list, 'orderCode'))
+            ->findOrEmpty();
+
+        if (!$temp->isEmpty()) return json_show(CommonModel::$error_param, $temp->orderCode . '订单并不是未发货状态');
+
+        $val = Validate::rule([
+            'orderCode|订单编号' => 'require|length:18',
+            'post_name|物流公司' => 'require|max:255',
+            'post_code|物流单号' => 'require|max:255',
+        ]);
+
+        Db::startTrans();
+        try {
+
+            $date = date('Y-m-d H:i:s');
+
+            foreach ($list as $order) {
+
+                if (!$val->check($order)) throw new Exception($val->getError());
+
+                $db->where([
+                    'is_del' => CommonModel::$del_normal,
+                    'orderCode' => $order['orderCode'],
+                    'status' => $db::$status_not_deliver,
+                ])->save([
+                    'status' => $db::$status_deliver,
+                    'post_name' => $order['post_name'],
+                    'post_code' => $order['post_code'],
+                    'updater' => self::$uname,
+                    'updaterid' => self::$uid,
+                    'updatetime' => $date,
+                ]);
+            }
+
+            Db::commit();
+            return json_show(CommonModel::$success, '发货成功');
+        } catch (Exception $exception) {
+            Db::rollback();
+            return json_show(CommonModel::$error_param, '发货失败,' . $exception->getMessage());
+        }
+
+    }
 
 }

app/admin/middleware/apiMiddleware.php

@@ -16,7 +16,7 @@ class apiMiddleware
 {
 
     //白名单
-    private $white_list = ['login','test'];
+    private $white_list = ['login','orderExchangeExport'];
 
     //请求入口
     public function handle($request, \Closure $next)

app/admin/route/app.php

@@ -137,6 +137,9 @@ Route::rule('serviceStatus', 'admin/Service/status');//上下架
 //【兑换订单】
 Route::rule('orderExchangeList', 'admin/OrderExchange/list');//列表
 Route::rule('orderExchangeRead', 'admin/OrderExchange/read');//详情
+Route::rule('orderExchangeDeliver', 'admin/OrderExchange/deliver');//发货
+Route::rule('orderExchangeExport', 'admin/OrderExchange/export');//导出
+Route::rule('orderExchangeDeliver', 'admin/OrderExchange/deliver');//发货
 
 //【手机主题】
 Route::rule('themeList', 'admin/Theme/list');//列表

app/common.php

@@ -168,3 +168,129 @@ if (!function_exists('UploadImg')) {
 
     }
 }
+
+//导出文件成压缩包
+if (!function_exists('excel_save')) {
+    function excel_save($fileName = '', $headArr = [], $data = [])
+    {
+        $objPHPExcel = new PHPExcel();
+        $objPHPExcel->getProperties();
+        $keyA = 0; // 设置表头
+        foreach ($headArr as $v) {
+            $colum = PHPExcel_Cell::stringFromColumnIndex($keyA);
+            $objPHPExcel->setActiveSheetIndex(0)->setCellValue($colum . '1', $v);
+            $keyA += 1;
+        }
+
+        $column = 2;
+        $objActSheet = $objPHPExcel->getActiveSheet();
+
+        foreach ($data as $key => $rows) { // 行写入
+            $span = 0;
+            foreach ($rows as $keyName => $value) { // 列写入
+                //判断数据是否有数组，如果有数组，转换成字符串
+
+                if (is_array($value)) $value = implode("、", $value);
+
+                $objActSheet->setCellValue(PHPExcel_Cell::stringFromColumnIndex($span) . $column, $value);
+                $span++;
+            }
+            $column++;
+        }
+        //  var_dump($objActSheet->getActiveCell());
+        $file = $fileName . ".xls";
+        //$fileName .= "_" . date("Y_m_d", Request()->instance()->time()) . ".xls";
+        //$fileName = iconv("utf-8", "gb2312", $fileName); // 重命名表
+        $dir = root_path() . 'public/storage/report/' . date("YmdHis") . "/";
+        if (!is_dir($dir)) mkdir($dir, 0777, true);
+
+
+        PHPExcel_Settings::setCacheStorageMethod(PHPExcel_CachedObjectStorageFactory::cache_in_memory_serialized);
+        $objPHPExcel->setActiveSheetIndex(0); // 设置活动单指数到第一个表,所以Excel打开这是第一个表
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
+        $objWriter->save($dir . $file); // 文件通过浏览器下载
+        $url = $dir . $file;
+        if (!file_exists($url)) throw new \think\Exception('文件生成失败');
+
+        $saveDir = root_path() . "public/storage/zip/";
+        if (!is_dir($saveDir)) mkdir($saveDir, 0777, true);
+
+//        $datetime = date("YmdHis");
+        $file_dir = $saveDir . $fileName . ".zip";
+        # 5.1 文件打包，提示：使用本类，linux需开启zlib，windows需取消php_zip.dll前的注释
+        $zip = new \ZipArchive ();
+        # 5.2 文件不存在则生成一个新的文件 用CREATE打开文件会追加内容至zip
+        if ($zip->open($file_dir, \ZipArchive::OVERWRITE) !== true && $zip->open($file_dir, \ZipArchive::CREATE) !== true) throw new \think\Exception('无法打开文件或者文件创建失败');
+
+        # 5.3 批量写入压缩包
+        $zip->addEmptyDir($fileName);
+        // @$zip->addFile($v['file_path'], 'resume'.DIRECTORY_SEPARATOR.basename($headername));
+        @$zip->addFile($url, $fileName . DIRECTORY_SEPARATOR . basename($url));
+        # 5.4 关闭压缩包写入
+        $zip->close();
+        @deldir($dir);
+        # 6. 检查文件是否存在，并输出文件
+        if (!file_exists($file_dir)) throw new \think\Exception('导出文件不存在');
+
+        ob_clean();
+        flush();
+        header("Cache-Control: max-age=0");
+        header("Content-Description: File Transfer");
+        header('Content-disposition: attachment; filename=' . basename($file_dir)); # 处理文件名
+        header("Content-Type: application/octet-stream");                           # 流文件输出
+        header("Content-Transfer-Encoding: binary");                                # 告诉浏览器，这是二进制文件
+//    header('Content-Length: ' . filesize($file_dir));                           # 告诉浏览器，文件大小
+//    readfile($file_dir);                                                        # 输出文件
+        $res = read_big_file($file_dir);
+        foreach ($res as $val) {
+            echo $val;
+        }
+        @ unlink($file_dir);
+        exit();
+    }
+}
+
+
+//读取大文件
+if (!function_exists('read_big_file')) {
+    function read_big_file(string $file = '')
+    {
+        $handle = fopen($file, 'rb');
+        while (feof($handle) === false) {
+            yield fgets($handle);
+        }
+        fclose($handle);
+    }
+}
+
+//递归删除目录内的所有文件和本目录
+if (!function_exists('deldir')) {
+    function deldir($path)
+    {
+        //如果是目录则继续
+        if (is_dir($path)) {
+            //扫描一个文件夹内的所有文件夹和文件并返回数组
+            $p = scandir($path);
+            //如果 $p 中有两个以上的元素则说明当前 $path 不为空
+            if (count($p) > 2) {
+                foreach ($p as $val) {
+                    //排除目录中的.和..
+                    if ($val != "." && $val != "..") {
+                        //如果是目录则递归子目录，继续操作
+                        if (is_dir($path . $val)) {
+                            //子目录中操作删除文件夹和文件
+                            deldir($path . $val . '/');
+                        } else {
+                            //如果是文件直接删除
+                            unlink($path . $val);
+                        }
+                    }
+                }
+            }
+        }
+        //删除目录
+        return rmdir($path);
+    }
+}
+
+

app/model/OrderExchangeModel.php

@@ -9,4 +9,10 @@ class OrderExchangeModel extends Model
     protected $table = 'fc_order_exchange';
     protected $pk = 'id';
 
+
+    //状态:0未发货,1已发货,2已收货
+    public static $status_not_deliver = 0;
+    public static $status_deliver = 1;
+    public static $status_receipt = 2;
+
 }

composer.json

@@ -23,7 +23,8 @@
         "php": ">=7.2.5",
         "topthink/framework": "^6.0.0",
         "topthink/think-orm": "^2.0",
-        "topthink/think-multi-app": "^1.0"
+        "topthink/think-multi-app": "^1.0",
+        "phpoffice/phpexcel": "^1.8"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "604f2c27afda19f9faea016a74813af0",
+    "content-hash": "3aa191934404180c982ae2eea0633938",
     "packages": [
         {
             "name": "league/flysystem",
@@ -225,6 +225,79 @@
             ],
             "time": "2022-04-17T13:12:02+00:00"
         },
+        {
+            "name": "phpoffice/phpexcel",
+            "version": "1.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/PHPExcel.git",
+                "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870",
+                "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "php": "^5.2|^7.0"
+            },
+            "require-dev": {
+                "squizlabs/php_codesniffer": "2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "PHPExcel": "Classes/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Maarten Balliauw",
+                    "homepage": "http://blog.maartenballiauw.be"
+                },
+                {
+                    "name": "Erik Tilt"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "http://rootslabs.net"
+                },
+                {
+                    "name": "Mark Baker",
+                    "homepage": "http://markbakeruk.net"
+                }
+            ],
+            "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+            "homepage": "https://github.com/PHPOffice/PHPExcel",
+            "keywords": [
+                "OpenXML",
+                "excel",
+                "php",
+                "spreadsheet",
+                "xls",
+                "xlsx"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/PHPExcel/issues",
+                "source": "https://github.com/PHPOffice/PHPExcel/tree/master"
+            },
+            "abandoned": "phpoffice/phpspreadsheet",
+            "time": "2018-11-22T23:07:24+00:00"
+        },
         {
             "name": "psr/cache",
             "version": "1.0.1",