dever 3 years ago
parent
commit
23045ea0fe

+ 2 - 2
app/factory/admin/Excel.php

@@ -45,7 +45,7 @@ class Excel extends Core
 
             Dever::load('mshop/lib/buy')->setOutStatus($v['id'], 2);
 
-            if ($v['ps_info']) {
+            if ($v['ps_info'] && $v['ps_info']['cdate_day']) {
                 $ps_date = $v['ps_info']['cdate_day'];
             } else {
                 $ps_date = '-';
@@ -139,7 +139,7 @@ class Excel extends Core
             }
 
             Dever::load('mshop/lib/buy')->setOutStatus($v['id'], 2);
-            if ($v['ps_info']) {
+            if ($v['ps_info'] && $v['ps_info']['cdate_day']) {
                 $ps_date = $v['ps_info']['cdate_day'];
             } else {
                 $ps_date = '-';

+ 1 - 1
app/mshop/lib/Buy.php

@@ -280,7 +280,7 @@ class Buy
             $info['ps_info']['cdate_day'] = date('Y-m-d', $info['ps_info']['cdate']);
             $info['ps_info']['cdate'] = date('Y-m-d H:i', $info['ps_info']['cdate']);
             
-            $info['ps_info']['ydate_day'] = '';
+            $info['ps_info']['ydate_day'] = '-';
             if ($info['ps_info']['ydate']) {
                 $info['ps_info']['ydate_day'] = date('Y-m-d', $info['ps_info']['ydate']);
                 $info['ps_info']['ydate'] = date('Y-m-d H:i', $info['ps_info']['ydate']);

+ 3 - 3
app/store/admin/Excel.php

@@ -49,7 +49,7 @@ class Excel extends Core
 
                 Dever::load('mshop/lib/buy')->setOutStatus($v['id'], 2);
 
-                if ($v['ps_info']) {
+                if ($v['ps_info'] && $v['ps_info']['cdate_day']) {
                     $ps_date = $v['ps_info']['cdate_day'];
                 } else {
                     $ps_date = '-';
@@ -148,7 +148,7 @@ class Excel extends Core
 
                 Dever::load('mshop/lib/buy')->setOutStatus($v['id'], 2);
 
-                if ($v['ps_info']) {
+                if ($v['ps_info'] && $v['ps_info']['cdate_day']) {
                     $ps_date = $v['ps_info']['cdate_day'];
                 } else {
                     $ps_date = '-';
@@ -229,7 +229,7 @@ class Excel extends Core
             }
 
             Dever::load('mshop/lib/buy')->setOutStatus($v['id'], 2);
-            if ($v['ps_info']) {
+            if ($v['ps_info'] && $v['ps_info']['cdate_day']) {
                 $ps_date = $v['ps_info']['cdate_day'];
             } else {
                 $ps_date = '-';

+ 2 - 2
app/store/admin/Factory_excel.php

@@ -43,7 +43,7 @@ class Factory_excel extends Core
 
             Dever::load('mshop/lib/buy')->setOutStatus($v['id'], 1);
 
-            if ($v['ps_info']) {
+            if ($v['ps_info'] && isset($v['ps_info']['ydate_day']) && $v['ps_info']['ydate_day']) {
                 $ps_date = $v['ps_info']['ydate_day'];
             } else {
                 $ps_date = '-';
@@ -122,7 +122,7 @@ class Factory_excel extends Core
             }
 
             Dever::load('mshop/lib/buy')->setOutStatus($v['id'], 1);
-            if ($v['ps_info']) {
+            if ($v['ps_info'] && $v['ps_info']['cdate_day']) {
                 $ps_date = $v['ps_info']['cdate_day'];
             } else {
                 $ps_date = '-';