|
@@ -232,6 +232,7 @@ class RefundController extends Curd
|
|
|
if (empty($payDetail)) {
|
|
|
return json_fail("支付状态异常");
|
|
|
}
|
|
|
+ $refundPayIds = array_column($payDetail, 'pay_id');
|
|
|
$response = [];
|
|
|
Db::beginTransaction();
|
|
|
try {
|
|
@@ -240,11 +241,11 @@ class RefundController extends Curd
|
|
|
// return 表记录
|
|
|
if (!OrderReturn::where('join_return_order_id', $orderId)->exists()) {
|
|
|
$returnId = $this->createReturnRecord($order, $amount, $remark);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
//['amount' => $amount, 'user_id' => JwtToken::getCurrentId(), 'datetime' => date('Y-m-d H:i:s'), 'remark' => $remark ?? '']
|
|
|
OrderReturn::where('join_return_order_id', $orderId)->update([
|
|
|
'order_return_status' => 'DONE',
|
|
|
- 'order_return_refund_json'=>json_encode([
|
|
|
+ 'order_return_refund_json' => json_encode([
|
|
|
'amount' => $amount,
|
|
|
'user_id' => JwtToken::getCurrentId(),
|
|
|
'datetime' => date('Y-m-d H:i:s'),
|
|
@@ -290,9 +291,8 @@ class RefundController extends Curd
|
|
|
$response = [];
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
// payDetail 表记录
|
|
|
- $this->createReturnPayDetail($order, $prepayid, $amount, $response);
|
|
|
+ $this->createReturnPayDetail($order, $refundPayIds, $prepayid, $amount, $response);
|
|
|
|
|
|
Db::commit();
|
|
|
|
|
@@ -479,7 +479,7 @@ class RefundController extends Curd
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private function createReturnPayDetail($order, $prepayid, $amount, $response = [])
|
|
|
+ private function createReturnPayDetail($order,$refundPayIds, $prepayid, $amount, $response = [])
|
|
|
{
|
|
|
try {
|
|
|
return PayDetail::insert([
|
|
@@ -490,8 +490,8 @@ class RefundController extends Curd
|
|
|
'pay_amount' => $amount,
|
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
|
'pay_prepayid' => $prepayid,
|
|
|
- 'join_pay_object_json' => json_encode(['order_id'=>$order->order_id]),
|
|
|
- 'pay_json_request' => json_encode(['order_id' => $order->order_id]),
|
|
|
+ 'join_pay_object_json' => json_encode(['order_id' => $order->order_id]),
|
|
|
+ 'pay_json_request' => json_encode(['order_id' => $order->order_id,'refund_pay_ids'=>$refundPayIds]),
|
|
|
'pay_json_response' => json_encode($response),
|
|
|
'pay_addtimes' => time()
|
|
|
]);
|