|
@@ -289,20 +289,29 @@ Class Manage
|
|
|
}
|
|
|
// print_R($id);die;
|
|
|
$refund = Dever::db('active/info_refund')->getSearch(array('order_id'=>$id));
|
|
|
- // echo dever::sql();die;
|
|
|
- $refund_log = Dever::db('active/info_refund_log')->getSearch(array('order_id'=>$id));
|
|
|
- $refund_money = $refund['price'] + $refund_log['price'];
|
|
|
+ $refund_path = array();
|
|
|
$refund_desc = '';
|
|
|
- if ($refund['desc']) {
|
|
|
- $refund_desc = $refund['desc'];
|
|
|
- } else if ($refund_log && $refund_log['desc']) {
|
|
|
- $refund_desc = $refund_log['desc'];
|
|
|
+ if ($refund) {
|
|
|
+ foreach ($refund as $k1 => $v1) {
|
|
|
+ $refund_log = Dever::db('active/info_refund_log')->getSearch(array('order_id'=>$v1['id']));
|
|
|
+ $refund_desc = $v1['desc'];
|
|
|
+ if ($refund_log) {
|
|
|
+ if ($refund_log['desc'] != $v1['desc']) {
|
|
|
+ $refund_desc = $refund_log['desc'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!$v1['num']) {
|
|
|
+ $v1['num'] = 0;
|
|
|
+ }
|
|
|
+ if (!$v1['price']) {
|
|
|
+ $v1['price'] = 0;
|
|
|
+ }
|
|
|
+ $refund_path[] = array('退款数量',$v1['num']);
|
|
|
+ $refund_path[] = array('退款金额',$v1['price']);
|
|
|
+ $refund_path[] = array('退款备注',$refund_desc);
|
|
|
+ }
|
|
|
}
|
|
|
- // if ($active['col'] && $active['col'] == 'idcard') {
|
|
|
- // $user_idcard = $user['idcard'];
|
|
|
- // } else {
|
|
|
- // $user_idcard = '';
|
|
|
- // }
|
|
|
+
|
|
|
$path = array();
|
|
|
$path_data = array();
|
|
|
if ($info['path']) {
|
|
@@ -344,13 +353,25 @@ Class Manage
|
|
|
),
|
|
|
array
|
|
|
(
|
|
|
- array('退款数量', $info['refund_num']),
|
|
|
- array('退款总金额', $refund_money),
|
|
|
- array('退款备注', $refund_desc),
|
|
|
+ // array('退款数量', $info['refund_num']),
|
|
|
+ // array('退款总金额', $refund_money),
|
|
|
+ // array('退款备注', $refund_desc),
|
|
|
|
|
|
),
|
|
|
),
|
|
|
);
|
|
|
+ if ($refund_path && $refund) {
|
|
|
+ $result['退款信息'] = array
|
|
|
+ (
|
|
|
+ 'type' => 'info',
|
|
|
+ 'content' => array
|
|
|
+ (
|
|
|
+ $refund_path,
|
|
|
+ ),
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
$result['用户信息'] = array
|
|
|
(
|
|
|
'type' => 'info',
|