feat: 完善商品计奖隔离、积分商城兑换券抵扣与下线售后退款入口
这个提交包含在:
@@ -60,12 +60,23 @@ class VoucherService
|
||||
if ($totalVoucher <= 0 || empty($ext['voucher_consumed'])) {
|
||||
return;
|
||||
}
|
||||
$fee = $refundFee !== null ? min($totalVoucher, round((float) $refundFee, 2)) : $totalVoucher;
|
||||
$userId = intval($order['user_id'] ?? 0);
|
||||
$orderId = intval($order['id'] ?? 0);
|
||||
|
||||
// 幂等防重:检查是否已退回过兑换券,避免多次退款事件重复返还额度
|
||||
$alreadyRefunded = (float) RewardModel::where('order_id', $orderId)
|
||||
->where('reward_type', 'voucher_consume_refund')
|
||||
->sum('amount');
|
||||
$remainVoucher = max(0, round((float) $totalVoucher - $alreadyRefunded, 2));
|
||||
if ($remainVoucher <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
$fee = $refundFee !== null ? min($remainVoucher, round((float) $refundFee, 2)) : $remainVoucher;
|
||||
if ($fee <= 0) {
|
||||
return;
|
||||
}
|
||||
$userId = intval($order['user_id'] ?? 0);
|
||||
$orderId = intval($order['id'] ?? 0);
|
||||
|
||||
$agent = AgentModel::where('user_id', $userId)->lock(true)->find();
|
||||
if ($agent) {
|
||||
$agent->voucher_used = max(0, round((float) $agent->voucher_used - $fee, 2));
|
||||
@@ -82,6 +93,15 @@ class VoucherService
|
||||
'ext' => ['formula' => "订单退款退回兑换券 {$fee}", 'order_id' => $orderId],
|
||||
'status' => 1,
|
||||
]);
|
||||
|
||||
if (is_object($order) && method_exists($order, 'save')) {
|
||||
$ext['voucher_refunded'] = round($alreadyRefunded + $fee, 2);
|
||||
if (bccomp((string) $ext['voucher_refunded'], (string) $totalVoucher, 2) >= 0) {
|
||||
$ext['voucher_consumed'] = 0;
|
||||
}
|
||||
$order->ext = $ext;
|
||||
$order->save();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,7 +133,9 @@ class VoucherService
|
||||
$times = (float) PartnerConfig::get('partner_voucher_times', 1.5);
|
||||
$days = intval(PartnerConfig::get('partner_voucher_days', 365));
|
||||
$days = $days > 0 ? $days : 365;
|
||||
$total = round((float) $order['pay_fee'] * $times, 2);
|
||||
$rewardService = new PartnerRewardService();
|
||||
$qualifiedPayFee = $rewardService->getQualifiedPayFee($order);
|
||||
$total = round((float) $qualifiedPayFee * $times, 2);
|
||||
if ($total <= 0) {
|
||||
return null;
|
||||
}
|
||||
@@ -146,7 +168,11 @@ class VoucherService
|
||||
'reward_type' => 'voucher_grant',
|
||||
'amount' => 0,
|
||||
'base_amount' => $total,
|
||||
'ext' => ['formula' => "实付{$order['pay_fee']} × {$times} = {$total},{$days}天释放"],
|
||||
'ext' => [
|
||||
'formula' => "计奖实付{$qualifiedPayFee} × {$times} = {$total},{$days}天释放",
|
||||
'qualified_pay_fee' => $qualifiedPayFee,
|
||||
'order_pay_fee' => $order['pay_fee'] ?? 0
|
||||
],
|
||||
'status' => 1,
|
||||
]);
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户