|
|
@@ -238,7 +238,9 @@ class RefundController extends Curd
|
|
|
// 主订单，退款作为优惠入库
|
|
|
$this->updateMainOrderByRefund($order, $amount, $remark);
|
|
|
// return 表记录
|
|
|
- $returnId = $this->createReturnRecord($order, $amount,$remark);
|
|
|
+ if (!OrderReturn::where('join_return_order_id', $orderId)->exists()) {
|
|
|
+ $returnId = $this->createReturnRecord($order, $amount, $remark);
|
|
|
+ }
|
|
|
|
|
|
// 组合支付，退到余额账户
|
|
|
$prepayid = '';
|
|
|
@@ -434,7 +436,7 @@ class RefundController extends Curd
|
|
|
* @return int
|
|
|
* @throws BusinessException
|
|
|
*/
|
|
|
- private function createReturnRecord($order, $amount,$remark)
|
|
|
+ private function createReturnRecord($order, $amount, $remark)
|
|
|
{
|
|
|
try {
|
|
|
return OrderReturn::insertGetId([
|
|
|
@@ -446,7 +448,7 @@ class RefundController extends Curd
|
|
|
'order_return_apply_datetime' => date('Y-m-d H:i:s'),
|
|
|
'order_return_apply_json' => json_encode(['reason' => '后台自定义退款']),
|
|
|
'order_return_accept_datetime' => date('Y-m-d H:i:s'),
|
|
|
- 'order_return_refund_json' => json_encode(['amount' => $amount, 'user_id' => JwtToken::getCurrentId(), 'datetime' => date('Y-m-d H:i:s'),'remark'=>$remark ?? '']),
|
|
|
+ 'order_return_refund_json' => json_encode(['amount' => $amount, 'user_id' => JwtToken::getCurrentId(), 'datetime' => date('Y-m-d H:i:s'), 'remark' => $remark ?? '']),
|
|
|
'order_return_addtimes' => time()
|
|
|
]);
|
|
|
} catch (\Exception $e) {
|
gorden