|
@@ -34,7 +34,8 @@ class Excel
|
|
$ps = Dever::db('shop/sell_order_ps')->find(array('order_id' => $v['id']));
|
|
$ps = Dever::db('shop/sell_order_ps')->find(array('order_id' => $v['id']));
|
|
$cdate = strstr($v['cdate'], '-') ? $v['cdate'] : date('Y-m-d H:i', $v['cdate']);
|
|
$cdate = strstr($v['cdate'], '-') ? $v['cdate'] : date('Y-m-d H:i', $v['cdate']);
|
|
$paydate = isset($v['paydate']) && $v['paydate'] ? date('Y-m-d H:i', $v['paydate']) : '-';
|
|
$paydate = isset($v['paydate']) && $v['paydate'] ? date('Y-m-d H:i', $v['paydate']) : '-';
|
|
- $operdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
|
|
|
|
|
|
+ $operdate = $v['cdate'] ? date('Y-m-d H:i',$v['cdate']) : '-';
|
|
|
|
+ // $operdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
|
|
|
|
|
|
$total_cash = Dever::load("shop/lib/manage.getTotalCash", $v['id']);
|
|
$total_cash = Dever::load("shop/lib/manage.getTotalCash", $v['id']);
|
|
$v['refund_cash'] = $v['refund_cash'] ? $v['refund_cash'] : 0;
|
|
$v['refund_cash'] = $v['refund_cash'] ? $v['refund_cash'] : 0;
|
|
@@ -205,7 +206,8 @@ class Excel
|
|
$ps = Dever::db('shop/sell_order_ps')->find(array('order_id' => $v['id']));
|
|
$ps = Dever::db('shop/sell_order_ps')->find(array('order_id' => $v['id']));
|
|
$cdate = strstr($v['cdate'], '-') ? $v['cdate'] : date('Y-m-d H:i', $v['cdate']);
|
|
$cdate = strstr($v['cdate'], '-') ? $v['cdate'] : date('Y-m-d H:i', $v['cdate']);
|
|
$paydate = isset($v['paydate']) && $v['paydate'] ? date('Y-m-d H:i', $v['paydate']) : '-';
|
|
$paydate = isset($v['paydate']) && $v['paydate'] ? date('Y-m-d H:i', $v['paydate']) : '-';
|
|
- $operdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
|
|
|
|
|
|
+ $operdate = $v['fadate'] ? date('Y-m-d H:i',$v['fadate']) : '-';
|
|
|
|
+ // $operdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
|
|
if ($v['fdate']) {
|
|
if ($v['fdate']) {
|
|
$fdate = strstr($v['fdate'], '-') ? $v['fdate'] : date('Y-m-d H:i', $v['fdate']);
|
|
$fdate = strstr($v['fdate'], '-') ? $v['fdate'] : date('Y-m-d H:i', $v['fdate']);
|
|
} else {
|
|
} else {
|