From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据,智能匹配是用户没登录前也是获取发布需求最新数据,登录后会根据用户发布的需求,通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错

---
 admin/app/common/model/plus/shareholder/Order.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/admin/app/common/model/plus/shareholder/Order.php b/admin/app/common/model/plus/shareholder/Order.php
index acfc0f2..a2d6583 100644
--- a/admin/app/common/model/plus/shareholder/Order.php
+++ b/admin/app/common/model/plus/shareholder/Order.php
@@ -141,6 +141,7 @@
             'user_id' => $order['user_id'],
             'order_id' => $order['order_id'],
             'order_type' => $order_type,
+            'total_price' => $capital['total_price'],
             'order_price' => $capital['orderPrice'],
             'is_settled' => 0,
             'shop_supplier_id' => $order['shop_supplier_id'],
@@ -159,7 +160,9 @@
         $setting = Setting::getItem('basic', $order['app_id']);
         $capital = [
             // 订单总金额(不含运费)
-            'orderPrice' => bcsub($order['pay_price'], $order['express_price'], 2),
+            'total_price' => bcsub($order['pay_price'], $order['express_price'], 2),
+            // 订单总金额(不含运费) 减去 结算价 = 订单利润
+            'orderPrice' => bcsub(bcsub($order['pay_price'], $order['express_price'], 2), $order['settlement_price'], 2),
             // 是否记录
             'is_record' => true
         ];

--
Gitblit v1.9.2