From abc7edc3c8ad59ff213c85413d0d6a10d7a0b6f7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 17 Dec 2025 18:03:09 +0800
Subject: [PATCH] 1.	发布供需消耗连盟币,连盟币数量在后台独立设置 2.	小程序供需个人中心可自由切换身份 3.	增加私信系统 4.	增加评论系统,用户可在发布者详情页进行评论操作,评论获得的连盟币可在后台设置 5.	增加发布者的等级,以好评个数为条件进行升级,小程序端会显示该等级的图标,如没有等级则不会显示图标 6.	增加设置消耗连盟币可以解锁、查看发布的信息,费用可在后台设置 7.	小程序供需大厅界面优化,以及增加了推荐栏目,该栏目按发布的分类相似进行匹配,比如A用户发布了 互联网 分类的需求,则会优先推荐匹配互联网分类的供应需求给他。

---
 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