From a111c728cf7c0d3f47d3356c96b384b01b2e06e0 Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Wed, 15 Mar 2023 16:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B0=8F=E7=BB=84=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=EF=BC=8C=E5=95=86=E6=88=B7=E3=80=81=E5=88=86=E4=BD=A3?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderCreateRepository.php   |  2 +-
 .../store/order/StoreOrderRepository.php         | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 0a165a65..33ba6cf3 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -1154,7 +1154,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                 $_order = [
                     'cartInfo' => $merchantCart,
                     'activity_type' => $orderInfo['order_type'],
-                    'commission_rate' => $makePrice,
+                    'commission_rate' => $shareRate,
                     'order_type' => $merchantCart['order']['isTake'] ? 1 : 0,
                     'is_virtual' => $order_model ? 1 : 0,
                     'order_sn' => $this->getNewOrderId() . ($k + 1),
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 400823fb..1c0bc42a 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -233,8 +233,11 @@ class StoreOrderRepository extends BaseRepository
                     //更新助力状态
                     app()->make(ProductAssistSetRepository::class)->changStatus($order->orderProduct[0]['activity_id']);
                 }
+                // 订单的类型 0 发货 1 自提
                 if ($order->order_type == 1 && $order->status != 10)
+                {
                     $order->verify_code = $this->verifyCode();
+                }
                 $order->save();
                 $orderStatus[] = [
                     'order_id' => $order->order_id,
@@ -250,6 +253,7 @@ class StoreOrderRepository extends BaseRepository
                     }
                 }
 
+                // 商户流水账单数据
                 $finance[] = [
                     'order_id' => $order->order_id,
                     'order_sn' => $order->order_sn,
@@ -263,7 +267,17 @@ class StoreOrderRepository extends BaseRepository
                     'financial_record_sn' => $financeSn . ($i++)
                 ];
 
-                $_payPrice = bcsub($order->pay_price, bcadd($order['extension_one'], $order['extension_two'], 3), 2);
+                // 判断购买来源 小组采购或者普通购买
+                if($order['source'] == 1)
+                {   
+                    // 商户可获得金额 商户可得的钱 小组服务采购
+                    $_payPrice = $order->pay_price;
+                    
+                }else{
+                    // 商户可获得金额 减去佣金金额 == 商户可得的钱   分销推广或普通购买
+                    $_payPrice = bcsub($order->pay_price, bcadd($order['extension_one'], $order['extension_two'], 3), 2);
+                }
+
                 if ($presell) {
                     if (isset($order->orderProduct[0]['cart_info']['presell_extension_one']) && $order->orderProduct[0]['cart_info']['presell_extension_one'] > 0) {
                         $_payPrice = bcadd($_payPrice, $order->orderProduct[0]['cart_info']['presell_extension_one'], 2);