|
@@ -48,10 +48,10 @@ class Refund
|
|
|
$refund_process = Dever::db($this->refund_table)->config['process'];
|
|
|
foreach ($data as $k => $v) {
|
|
|
if ($v['cash'] <= 0 && $v['re_cash'] > 0) {
|
|
|
- $data[$k]['cash'] = $v['re_cash'];
|
|
|
+ $data[$k]['cash'] = $v['cash'] = $v['re_cash'];
|
|
|
}
|
|
|
$data[$k]['cdate'] = date('Y-m-d H:i', $v['cdate']);
|
|
|
- if ($v['order_goods_id'] != -1 && $order['price'] > $v['cash']) {
|
|
|
+ if ($v['order_goods_id'] != -1 && $v['order_goods_id']) {
|
|
|
$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']));
|