From dd6fdd9bcff3c2b3dcebdb0db3f80bc9dd469bc4 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Thu, 25 Dec 2025 10:00:15 +0800
Subject: [PATCH] 1. 添加滚动效果 2. 修复供应方无法开通权限
---
admin/app/api/service/order/settled/OrderSettledService.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/admin/app/api/service/order/settled/OrderSettledService.php b/admin/app/api/service/order/settled/OrderSettledService.php
index 2abfee4..31cecd8 100644
--- a/admin/app/api/service/order/settled/OrderSettledService.php
+++ b/admin/app/api/service/order/settled/OrderSettledService.php
@@ -112,7 +112,7 @@
// 设置订单商品总金额(不含优惠折扣)
$this->setOrderTotalPrice($supplier['productList']);
$orderTotalPrice += $this->orderData['order_total_price'];
- // 设置订单商品总结算金额(不含优惠折扣)
+ // 设置订单商品总结算金额
$this->setOrderSettlementPrice($supplier['productList']);
$settlementPrice += $this->orderData['settlement_price'];
// 先计算商品满减
@@ -342,7 +342,7 @@
private function setOrderSettlementPrice($productList)
{
// 订单商品的总金额(不含优惠券折扣)
- $this->orderData['settlement_price'] = helper::number2(helper::getArrayColumnSum($productList, 'settlement_price'));
+ $this->orderData['settlement_price'] = helper::number2(helper::getArrayColumnSum($productList, 'total_settlement_price'));
}
/**
@@ -794,6 +794,7 @@
'consumption_bonus' => isset($product['consumption_bonus'])?$product['consumption_bonus']:0,
'total_num' => $product['total_num'],
'total_price' => $product['total_price'],
+ 'total_settlement_price' => $product['total_settlement_price'],
'total_pay_price' => $product['total_pay_price'],
'supplier_money' => $product['supplier_money'],
'is_agent' => $product['is_agent'],
@@ -908,7 +909,7 @@
$product['max_points_num'] = $product['points_num'];
} else {
// 商品不允许积分抵扣
- if (!$product['is_points_discount']) continue;
+ if (!$product['is_points_discount']||$product['is_vip']||$product['is_newcomer']||$product['is_repurchase']) continue;
// 积分抵扣比例
$deductionRatio = helper::bcdiv($setting['discount']['max_money_ratio'], 100);
// 最多可抵扣的金额
--
Gitblit v1.9.2