From e6e0289a57f8bb19134b16ddcfbea7d7a81660be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Thu, 16 Feb 2023 18:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/order/StoreOrder.php | 1 +
 crmeb/app/services/agent/AgentManageServices.php      | 2 +-
 crmeb/app/services/order/StoreOrderRefundServices.php | 4 ++--
 crmeb/app/services/user/UserBillServices.php          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
index 1298303a0..afc61f48e 100644
--- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
+++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php
@@ -81,6 +81,7 @@ class StoreOrder extends AuthController
         ]);
         $where['is_system_del'] = 0;
         $where['pid'] = 0;
+        if ($where['status'] == 1) $where = $where + ['shipping_type' => 1];
         return app('json')->success($this->services->getOrderList($where, ['*'], ['split' => function ($query) {
             $query->field('id,pid');
         }, 'pink', 'invoice', 'division']));
diff --git a/crmeb/app/services/agent/AgentManageServices.php b/crmeb/app/services/agent/AgentManageServices.php
index e0817a7d9..02e9793a2 100644
--- a/crmeb/app/services/agent/AgentManageServices.php
+++ b/crmeb/app/services/agent/AgentManageServices.php
@@ -66,7 +66,7 @@ class AgentManageServices extends BaseServices
                 $item['new_money'] = bcsub((string)$item['brokerage_price'], (string)$item['broken_commission'], 2);
             else
                 $item['new_money'] = 0;
-            $item['brokerage_money'] = $item['brokerage_price'];
+            $item['brokerage_money'] = bcadd((string)$item['brokerage_price'], (string)$item['extract_count_price'], 2);
             unset($item['extract'], $item['order'], $item['bill'], $item['spreadUser'], $item['spreadCount']);
             if (strpos($item['headimgurl'], '/statics/system_images/') !== false) {
                 $item['headimgurl'] = set_file_url($item['headimgurl']);
diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index 4a9348d8d..acdae6d71 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -274,10 +274,10 @@ class StoreOrderRefundServices extends BaseServices
 
             return $splitOrderInfo;
         });
+        //处理开票
+        app()->make(StoreOrderInvoiceServices::class)->update(['order_id' => $order['id']], ['is_refund' => 1]);
         //订单退款记录
         ProductLogJob::dispatch(['refund', ['uid' => $order['uid'], 'order_id' => $order['id']]]);
-        //订单同意退款事件
-        event('order.refund', [$refundData, $order, 'order_refund']);
         event('notice.notice', [['data' => $refundData, 'order' => $order], 'order_refund']);
         return true;
     }
diff --git a/crmeb/app/services/user/UserBillServices.php b/crmeb/app/services/user/UserBillServices.php
index 8b7758ab5..13c356d28 100644
--- a/crmeb/app/services/user/UserBillServices.php
+++ b/crmeb/app/services/user/UserBillServices.php
@@ -780,7 +780,7 @@ class UserBillServices extends BaseServices
         $userExtract = app()->make(UserExtractServices::class);
         $extractSumList = $userExtract->getUsersSumList($uids);
         foreach ($list as &$item) {
-            $item['sum_number'] = $item['income'] > $item['pay'] ? bcsub($item['income'], $item['pay'], 2) : 0;
+            $item['sum_number'] = $item['income'];
             $item['nickname'] = $item['nickname'] . "|" . ($item['phone'] ? $item['phone'] . "|" : '') . $item['uid'];
             $item['extract_price'] = $extractSumList[$item['uid']] ?? 0;
             $item['time'] = $item['time'] ? date('Y-m-d H:i:s', $item['time']) : '';