wugg 2 gadi atpakaļ
vecāks
revīzija
0f29a936cc
2 mainītis faili ar 3 papildinājumiem un 4 dzēšanām
  1. 1 1
      app/admin/controller/Export.php
  2. 2 3
      config/database.php

+ 1 - 1
app/admin/controller/Export.php

@@ -47,7 +47,7 @@ class Export extends BaseController
             ->leftJoin('invoice_pool_info b', 'a.invNo=b.invNo')
             ->leftJoin('invoice_ticket c', 'a.invNo=c.invNo and c.type=0')
             ->leftJoin('invoice_good d', 'd.invNo=a.invNo')
-            ->leftJoin('assoc e', 'e.orderCode=d.orderCode AND e.status=1 AND e.is_del=0')
+            ->leftJoin('assoc e', 'e.orderCode=d.orderCode AND e.status in (1,2) AND e.is_del=0')
             ->leftJoin('qrd_info f', 'f.sequenceNo=e.orderCode')
             ->leftJoin('good g', 'g.spuCode=d.goodNo')
             ->withAttr('开票方式', function ($val) use ($open_type) {

+ 2 - 3
config/database.php

@@ -34,7 +34,7 @@ return [
             // 端口
             'hostport'        => env('database.hostport', '3306'),
             // 数据库连接参数
-            'params'          => [],
+            'params'          => [PDO::ATTR_STRINGIFY_FETCHES=>true],
             // 数据库编码默认采用utf8
             'charset'         => env('database.charset', 'utf8'),
             // 数据库表前缀
@@ -72,8 +72,7 @@ return [
             // 密码
             'password'        => env('database.password1', 'root'),
             // 数据库表前缀
-            'prefix'          => env('database.prefix1
-            ', 'wsm_'),
+            'prefix'          => env('database.prefix1', 'wsm_'),
 
         ],
     ],