|
@@ -82,11 +82,11 @@ class RefundController extends Curd
|
|
|
foreach ($items as &$item){
|
|
|
if (!empty($item['order_return_apply_json']) && is_json($item['order_return_apply_json'])){
|
|
|
$json = json_decode($item['order_return_apply_json'],true);
|
|
|
- $item['order_return_apply_json'] = $json['apply'];
|
|
|
+ $item['order_return_apply_json'] = $json['apply'] ?? '';
|
|
|
}
|
|
|
if (!empty($item['order_return_recharge_json']) && is_json($item['order_return_recharge_json'])){
|
|
|
$json = json_decode($item['order_return_recharge_json'],true);
|
|
|
- $item['order_return_recharge_json'] = $json['change'];
|
|
|
+ $item['order_return_recharge_json'] = $json['change'] ?? '';
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -166,13 +166,13 @@ class RefundController extends Curd
|
|
|
}
|
|
|
|
|
|
if (!empty($item['refund'])){
|
|
|
- if (!empty($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);
|
|
|
- $item['refund']['order_return_apply_json'] = $json['apply'];
|
|
|
+ $item['refund']['order_return_apply_json'] = $json['apply'] ?? '';
|
|
|
}
|
|
|
- if (!empty($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);
|
|
|
- $item['refund']['order_return_recharge_json'] = $json['change'];
|
|
|
+ $item['refund']['order_return_recharge_json'] = $json['change'] ?? '';
|
|
|
}
|
|
|
}
|
|
|
}
|