|
@@ -383,7 +383,7 @@ class RefundController extends Curd
|
|
|
$json = json_decode($return['order_return_recharge_json'], true);
|
|
|
$return['change'] = $json['change'] ?? '';
|
|
|
}
|
|
|
- if (!empty($return['join_order_return_user_id'])){
|
|
|
+ if (!empty($return['join_order_return_user_id'])) {
|
|
|
$return['disposeUserName'] = SysUser::where('user_id', $return['join_order_return_user_id'])->value('user_name');
|
|
|
}
|
|
|
if (!empty($return['order_return_refund_json'])) {
|
|
@@ -881,18 +881,25 @@ class RefundController extends Curd
|
|
|
'coupon_detail_status' => 'DISABLED'
|
|
|
]);
|
|
|
|
|
|
- // 产生一条退款记录 (pay_detail)
|
|
|
- PayDetail::insert([
|
|
|
+ // 产生两条退款记录 (pay_detail)
|
|
|
+ $payDetailInsertData = [
|
|
|
'join_pay_member_id' => $memberId,
|
|
|
'join_pay_order_id' => 'ROLE_REFUND',
|
|
|
'join_pay_object_json' => '[]',
|
|
|
'pay_status' => 'SUCCESS',
|
|
|
'pay_category' => 'ROLE_REFUND',
|
|
|
- 'pay_amount' => $amount + $addedAmount,
|
|
|
+ 'pay_amount' => $refundApplyJson['amount'],
|
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
|
'pay_prepayid' => $memberId . '-CASH',
|
|
|
'pay_addtimes' => time()
|
|
|
- ]);
|
|
|
+ ];
|
|
|
+ // 退款记录
|
|
|
+ PayDetail::insert($payDetailInsertData);
|
|
|
+ // 扣除记录
|
|
|
+ $payDetailInsertData['join_pay_order_id'] = 'ROLE_DEDUCT';
|
|
|
+ $payDetailInsertData['pay_category'] = 'ROLE_DEDUCT';
|
|
|
+ $payDetailInsertData['pay_amount'] = $refundApplyJson['surplus'] + $addedAmount;
|
|
|
+ PayDetail::insert($payDetailInsertData);
|
|
|
|
|
|
Db::commit();
|
|
|
|