|
@@ -38,6 +38,9 @@ class RefundController extends Curd
|
|
'member' => function ($query) {
|
|
'member' => function ($query) {
|
|
$query->select('member_id', 'member_mobile');
|
|
$query->select('member_id', 'member_mobile');
|
|
},
|
|
},
|
|
|
|
+ 'cert'=>function($query){
|
|
|
|
+ $query->select('join_cert_member_id','member_cert_name');
|
|
|
|
+ },
|
|
'order' => function ($query) {
|
|
'order' => function ($query) {
|
|
$query->select('order_id', 'order_name');
|
|
$query->select('order_id', 'order_name');
|
|
}
|
|
}
|
|
@@ -168,7 +171,7 @@ class RefundController extends Curd
|
|
if (!empty($item['refund'])){
|
|
if (!empty($item['refund'])){
|
|
if (!empty($item['refund']['order_return_apply_json']) && is_json($item['refund']['order_return_apply_json'])){
|
|
if (!empty($item['refund']['order_return_apply_json']) && is_json($item['refund']['order_return_apply_json'])){
|
|
$json = json_decode($item['refund']['order_return_apply_json'],true);
|
|
$json = json_decode($item['refund']['order_return_apply_json'],true);
|
|
- $item['refund']['order_return_apply_json'] = $json['apply'] ?? '';
|
|
|
|
|
|
+ $item['refund']['order_return_apply_json'] = $json['reason'] ?? '';
|
|
}
|
|
}
|
|
if (!empty($item['refund']['order_return_recharge_json']) && is_json($item['refund']['order_return_recharge_json'])){
|
|
if (!empty($item['refund']['order_return_recharge_json']) && is_json($item['refund']['order_return_recharge_json'])){
|
|
$json = json_decode($item['refund']['order_return_recharge_json'],true);
|
|
$json = json_decode($item['refund']['order_return_recharge_json'],true);
|