|
@@ -358,6 +358,7 @@ class Excel
|
|
|
}
|
|
|
$info = Dever::db($table)->find($v['type_id']);
|
|
|
$goods = Dever::db('shop/buy_order_goods')->select(array('order_id' => $v['id']));
|
|
|
+ $ps = Dever::db('shop/buy_order_ps')->find(array('order_id' => $v['id']));
|
|
|
$cdate = strstr($v['cdate'], '-') ? $v['cdate'] : date('Y-m-d H:i', $v['cdate']);
|
|
|
$fdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
|
|
|
$ydate = ($ps && $ps['ydate']) ? date('Y-m-d H:i', $ps['ydate']) : '-';
|