|
|
@@ -36,7 +36,12 @@ class Refund
|
|
|
$refund_process = Dever::db($this->refund_table)->config['process'];
|
|
|
foreach ($data as $k => $v) {
|
|
|
$data[$k]['cdate'] = date('Y-m-d H:i', $v['cdate']);
|
|
|
- $data[$k]['goods'] = Dever::db($this->goods_table)->getDataByIds(array('ids' => $v['order_goods_id']));
|
|
|
+ if ($v['order_goods_id'] > 0) {
|
|
|
+ $data[$k]['goods'] = Dever::db($this->goods_table)->getDataByIds(array('ids' => $v['order_goods_id']));
|
|
|
+ } else {
|
|
|
+ $data[$k]['goods'] = Dever::db($this->goods_table)->getDataByIds(array('order_id' => $v['order_id']));
|
|
|
+ }
|
|
|
+
|
|
|
$data[$k]['status_name'] = $refund_status[$v['status']];
|
|
|
$data[$k]['process_name'] = $refund_process[$v['process']];
|
|
|
if ($data[$k]['goods']) {
|
dever