|
@@ -25,7 +25,7 @@ class Refund
|
|
# 获取退款记录
|
|
# 获取退款记录
|
|
public function getList($type, $id, $order_id)
|
|
public function getList($type, $id, $order_id)
|
|
{
|
|
{
|
|
- $data = Dever::load($this->lib)->set($type, 1)->getView($id, $order_id, false);
|
|
|
|
|
|
+ $order = Dever::load($this->lib)->set($type, 1)->getView($id, $order_id, false);
|
|
$where['order_id'] = $order_id;
|
|
$where['order_id'] = $order_id;
|
|
|
|
|
|
$data = Dever::db($this->refund_table)->select_page($where);
|
|
$data = Dever::db($this->refund_table)->select_page($where);
|
|
@@ -36,7 +36,7 @@ class Refund
|
|
$refund_process = Dever::db($this->refund_table)->config['process'];
|
|
$refund_process = Dever::db($this->refund_table)->config['process'];
|
|
foreach ($data as $k => $v) {
|
|
foreach ($data as $k => $v) {
|
|
$data[$k]['cdate'] = date('Y-m-d H:i', $v['cdate']);
|
|
$data[$k]['cdate'] = date('Y-m-d H:i', $v['cdate']);
|
|
- if ($v['order_goods_id'] > 0) {
|
|
|
|
|
|
+ if ($v['order_goods_id'] > 0 && $order['price'] > $data['cash']) {
|
|
$data[$k]['goods'] = Dever::db($this->goods_table)->getDataByIds(array('ids' => $v['order_goods_id']));
|
|
$data[$k]['goods'] = Dever::db($this->goods_table)->getDataByIds(array('ids' => $v['order_goods_id']));
|
|
} else {
|
|
} else {
|
|
$data[$k]['goods'] = Dever::db($this->goods_table)->getDataByIds(array('order_id' => $v['order_id']));
|
|
$data[$k]['goods'] = Dever::db($this->goods_table)->getDataByIds(array('order_id' => $v['order_id']));
|