|
@@ -175,12 +175,15 @@ class Core
|
|
}
|
|
}
|
|
|
|
|
|
# 退款
|
|
# 退款
|
|
- public function refundByOrder($order_id, $refund_order_id = false, $refund_cash = false)
|
|
|
|
|
|
+ public function refundByOrder($order_id, $refund_order_id = false, $refund_cash = false, $other = false)
|
|
{
|
|
{
|
|
$info = Dever::db('pay/order')->one(array('order_id' => $order_id));
|
|
$info = Dever::db('pay/order')->one(array('order_id' => $order_id));
|
|
if ($info && ($info['status'] == 1 || $info['status'] == 2 || $info['status'] == 6)) {
|
|
if ($info && ($info['status'] == 1 || $info['status'] == 2 || $info['status'] == 6)) {
|
|
if ($info['param']) {
|
|
if ($info['param']) {
|
|
$info['param'] = Dever::array_decode($info['param']);
|
|
$info['param'] = Dever::array_decode($info['param']);
|
|
|
|
+ if (isset($info['param']['other']) && $info['param']['other'] && $other) {
|
|
|
|
+ $info['param']['other'] = $other;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
$cash = $refund_cash ? $refund_cash : $info['cash'];
|
|
$cash = $refund_cash ? $refund_cash : $info['cash'];
|
|
$refund_data = array();
|
|
$refund_data = array();
|
|
@@ -198,7 +201,7 @@ class Core
|
|
}
|
|
}
|
|
$refund_order_id = $refund_order_id . '_' . Dever::order();
|
|
$refund_order_id = $refund_order_id . '_' . Dever::order();
|
|
}
|
|
}
|
|
- $state = $this->refund($info['order_id'], $cash, $info, $refund_order_id);
|
|
|
|
|
|
+ $state = $this->refund($info['order_id'], $cash, $info, $refund_order_id, $other);
|
|
if ($state) {
|
|
if ($state) {
|
|
if ($refund_order_id) {
|
|
if ($refund_order_id) {
|
|
$status = 6;
|
|
$status = 6;
|