feat: 完善商品计奖隔离、积分商城兑换券抵扣与下线售后退款入口
这个提交包含在:
@@ -101,9 +101,23 @@ class PartnerRewardService
|
||||
return Db::transaction(function () use ($order, $item) {
|
||||
$orderId = intval(is_array($order) ? ($order['id'] ?? 0) : ($order->id ?? 0));
|
||||
$itemPayFee = floatval(is_array($item) ? ($item['pay_fee'] ?? 0) : ($item->pay_fee ?? 0));
|
||||
$goodsId = intval(is_array($item) ? ($item['goods_id'] ?? 0) : ($item->goods_id ?? 0));
|
||||
$ext = is_array($item['ext'] ?? null) ? $item['ext'] : (json_decode($item['ext'] ?? '', true) ?: []);
|
||||
$isCommissionItem = true;
|
||||
if (isset($ext['is_commission']) && !$ext['is_commission']) {
|
||||
$isCommissionItem = false;
|
||||
} elseif ($goodsId > 0) {
|
||||
$cg = CommissionGoods::where('goods_id', $goodsId)->where('status', CommissionGoods::GOODS_COMMISSION_STATUS_ON)->find();
|
||||
if (!$cg) {
|
||||
$isCommissionItem = false;
|
||||
}
|
||||
} else {
|
||||
$isCommissionItem = false;
|
||||
}
|
||||
|
||||
$voucherService = new VoucherService();
|
||||
|
||||
if ($itemPayFee > 0) {
|
||||
if ($itemPayFee > 0 && $isCommissionItem) {
|
||||
$voucherService->reduceByRefund($orderId, $itemPayFee);
|
||||
}
|
||||
|
||||
@@ -116,7 +130,7 @@ class PartnerRewardService
|
||||
'amount' => 0,
|
||||
'base_amount' => $itemPayFee,
|
||||
'ext' => [
|
||||
'formula' => "子商品退款 {$itemPayFee},缩减兑换券总额",
|
||||
'formula' => $isCommissionItem ? "计奖商品退款 {$itemPayFee},缩减兑换券总额" : "非计奖商品退款 {$itemPayFee},无需缩减兑换券",
|
||||
'item_id' => $item['id'] ?? 0,
|
||||
'partial_refund' => 1
|
||||
],
|
||||
@@ -127,6 +141,42 @@ class PartnerRewardService
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取订单中参与计奖的商品实付金额之和(排除非计奖商品及活动不参与项)
|
||||
*/
|
||||
public function getQualifiedPayFee($order)
|
||||
{
|
||||
if (!$order || ($order['type'] ?? '') === 'score') {
|
||||
return 0.0;
|
||||
}
|
||||
$items = $order['items'] ?? [];
|
||||
if (empty($items) && !empty($order['id'])) {
|
||||
$fresh = OrderModel::with(['items'])->where('id', $order['id'])->find();
|
||||
if ($fresh) {
|
||||
$order = $fresh;
|
||||
$items = $fresh['items'] ?? [];
|
||||
}
|
||||
}
|
||||
$total = 0.0;
|
||||
foreach ($items as $item) {
|
||||
$ext = is_array($item['ext'] ?? null) ? $item['ext'] : (json_decode($item['ext'] ?? '', true) ?: []);
|
||||
if (isset($ext['is_commission']) && !$ext['is_commission']) {
|
||||
continue;
|
||||
}
|
||||
$goods = CommissionGoods::where('goods_id', $item['goods_id'])
|
||||
->where('status', CommissionGoods::GOODS_COMMISSION_STATUS_ON)
|
||||
->find();
|
||||
if ($goods) {
|
||||
$itemPay = floatval($item['pay_fee'] ?? 0);
|
||||
$total = function_exists('bcadd') ? (float) bcadd((string) $total, (string) $itemPay, 2) : round($total + $itemPay, 2);
|
||||
}
|
||||
}
|
||||
// 计奖实付金额上限不得超过整单实际现金支付金额(防止使用兑换券/整单折扣抵扣后对券抵扣部分重复计奖)
|
||||
$orderPayFee = max(0, floatval($order['pay_fee'] ?? 0));
|
||||
$total = min($total, $orderPayFee);
|
||||
return (float) $total;
|
||||
}
|
||||
|
||||
public function isQualified($order)
|
||||
{
|
||||
if (!$order || ($order['type'] ?? '') === 'score') {
|
||||
@@ -139,26 +189,12 @@ class PartnerRewardService
|
||||
if (!in_array($status, [OrderModel::STATUS_PAID, OrderModel::STATUS_COMPLETED])) {
|
||||
return false;
|
||||
}
|
||||
$items = $order['items'] ?? [];
|
||||
if (empty($items) && !empty($order['id'])) {
|
||||
$fresh = OrderModel::with(['items'])->where('id', $order['id'])->find();
|
||||
if ($fresh) {
|
||||
$order = $fresh;
|
||||
$items = $fresh['items'] ?? [];
|
||||
}
|
||||
$qualifiedPayFee = $this->getQualifiedPayFee($order);
|
||||
$minAmount = (float) PartnerConfig::get('partner_order_min_amount', 0);
|
||||
if ($minAmount > 0) {
|
||||
return $qualifiedPayFee >= $minAmount;
|
||||
}
|
||||
foreach ($items as $item) {
|
||||
if (isset($item['ext']['is_commission']) && !$item['ext']['is_commission']) {
|
||||
continue;
|
||||
}
|
||||
$goods = CommissionGoods::where('goods_id', $item['goods_id'])
|
||||
->where('status', CommissionGoods::GOODS_COMMISSION_STATUS_ON)
|
||||
->find();
|
||||
if ($goods) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return $qualifiedPayFee > 0;
|
||||
}
|
||||
|
||||
public function touchSelfOrder($userId, $time = null)
|
||||
|
||||
在新工单中引用
屏蔽一个用户