From 7c1f5df5b6e0360cbc64bedcf1da2ce15f3aa705 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 24 Oct 2026 16:55:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95):=20?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=B1=BB=E7=A7=AF=E5=88=86=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E4=B8=8D=E5=9C=A8=E5=A4=87=E6=B3=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=94=B9=E7=94=B1=E5=85=B3=E8=81=94=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E5=9B=9E=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/services/order/OrderRefundRewardServices.php | 5 +++-- backend/app/services/order/RefundEffectServices.php | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/app/services/order/OrderRefundRewardServices.php b/backend/app/services/order/OrderRefundRewardServices.php index 751e3cb97..a0687957a 100644 --- a/backend/app/services/order/OrderRefundRewardServices.php +++ b/backend/app/services/order/OrderRefundRewardServices.php @@ -94,13 +94,14 @@ class OrderRefundRewardServices extends BaseService $deductProduct = min($dueProduct, $balance); $deduct = $deductOrder + $deductProduct; $userBillServices = $this->app->make(UserBillServices::class); + // 单号不写入备注:后台积分记录按 link_id 回查中台订单,展示在「关联订单」列 if ($deductOrder > 0 && !$userBillServices->billIntegralIncome( - 'order_gain_refund', $uid, $deductOrder, (int)$order['id'], '订单退款回收下单赠送积分:' . $order['order_no'] + 'order_gain_refund', $uid, $deductOrder, (int)$order['id'], '订单退款回收下单赠送积分' )) { throw new \RuntimeException('退款赠积分冲正失败'); } if ($deductProduct > 0 && !$userBillServices->billIntegralIncome( - 'product_gain_refund', $uid, $deductProduct, (int)$order['id'], '订单退款回收购买商品赠送积分:' . $order['order_no'] + 'product_gain_refund', $uid, $deductProduct, (int)$order['id'], '订单退款回收购买商品赠送积分' )) { throw new \RuntimeException('退款赠积分冲正失败'); } diff --git a/backend/app/services/order/RefundEffectServices.php b/backend/app/services/order/RefundEffectServices.php index 863b200ad..2ef970107 100644 --- a/backend/app/services/order/RefundEffectServices.php +++ b/backend/app/services/order/RefundEffectServices.php @@ -368,15 +368,16 @@ class RefundEffectServices extends BaseService implements RefundEffectContextInt $refundIntegral = (int)($refundOrder['refund_integral'] ?? 0); if ($refundIntegral > 0) { - $this->once('integral_refund', 'uid:' . $uid, ['integral' => $refundIntegral], function () use ($uid, $refundIntegral, $refundOrder): void { + $this->once('integral_refund', 'uid:' . $uid, ['integral' => $refundIntegral], function () use ($uid, $refundIntegral, $orderCenterId): void { /** @var UserBillServices $billServices */ $billServices = $this->app->make(UserBillServices::class); + // link_id 统一存中台订单ID(后台积分记录按它回查订单号展示在「关联订单」列),单号不写入备注 $billServices->billIntegralIncome( 'pay_product_integral_back', $uid, $refundIntegral, - (int)$refundOrder['id'], - '售后退款返还积分,退款单:' . $refundOrder['refund_no'] + $orderCenterId, + '售后退款返还积分' ); }); }