From 014cd84106239c5f11fb427a4cdd3abd5f3665d7 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 2 Mar 2024 15:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0h5=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=E7=9A=84?=
=?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../store/order/StoreOrderRepository.php | 19 ++++++++++---------
.../merchant/FinancialRecordRepository.php | 1 +
crmeb/services/ExcelService.php | 1 +
public/index.html | 2 +-
public/static/js/index.4a7caa24.js | 1 +
.../pages-users-login-login_copy.8811fed6.js | 1 +
6 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 public/static/js/index.4a7caa24.js
create mode 100644 public/static/js/pages-users-login-login_copy.8811fed6.js
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 2a913d07..53b0e1a6 100755
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -234,11 +234,11 @@ class StoreOrderRepository extends BaseRepository
if ($order->source == 999) {
$order->status = 3;
//订单确认收货，增加商户销售金额
- Merchant::where('mer_id', $order->mer_id)->update(['sale_amount' => Db::raw('sale_amount+' . $order->pay_price)]);
+ Merchant::where('mer_id', $order->mer_id)->update(['sale_amount' => Db::raw('sale_amount+' . $order->total_price)]);
//订单确认收货，增加商户采购金额
$merId = Merchant::where('uid', $order->uid)->value('mer_id');
if (!empty($merId)) {
- Merchant::where('mer_id', $merId)->update(['purchase_amount' => Db::raw('purchase_amount+' . $order->pay_price)]);
+ Merchant::where('mer_id', $merId)->update(['purchase_amount' => Db::raw('purchase_amount+' . $order->total_price)]);
}
}
$svipDiscount = bcadd($order->svip_discount, $svipDiscount, 2);
@@ -321,21 +321,22 @@ class StoreOrderRepository extends BaseRepository
$financeDao->platformOut($order->consumption_money, 'platform_consumption');
}
- $_payPrice = bcsub($order->pay_price, bcadd($order['extension_one'], $order['extension_two'], 3), 2);
+ $_payPrice = bcsub($order->total_price, bcadd($order['extension_one'], $order['extension_two'], 3), 2);
+ $_payPrice = bcsub($_payPrice, $order->consumption_money, 2);
// 平台支出推广费
$promoter = $order->merchant->promoter();
- if (!empty($promoter)) {
- $promoterCommission = bcmul($_payPrice, 0.003, 2);
+ $promoterCommission = bcmul($_payPrice, 0.003, 2);
+ if (!empty($promoter) && $promoterCommission > 0) {
$financeDao->platformOut($promoterCommission, 'commission_to_promoter');
}
// 平台收入手续费
- if ($order['commission_rate'] > 0) {
- $commission_rate = bcdiv((string)$order['commission_rate'],'100',6);
- $platformCommission = bcmul($_payPrice, (string)$commission_rate, 2);
+ $commission_rate = bcdiv((string)$order['commission_rate'],'100',6);
+ $platformCommission = bcmul($_payPrice, (string)$commission_rate, 2);
+ if ($commission_rate > 0 && $platformCommission > 0) {
$_payPrice = bcsub($_payPrice, $platformCommission, 2);
- if (isset($promoterCommission) && $promoterCommission > 0) {
+ if ($promoterCommission > 0) {
$platformCommission = bcsub($platformCommission, $promoterCommission, 2);
}
$financeDao->platformIn($platformCommission, 'commission_to_platform', $order['mer_id']);
diff --git a/app/common/repositories/system/merchant/FinancialRecordRepository.php b/app/common/repositories/system/merchant/FinancialRecordRepository.php
index 5eec9bf1..196e4130 100755
--- a/app/common/repositories/system/merchant/FinancialRecordRepository.php
+++ b/app/common/repositories/system/merchant/FinancialRecordRepository.php
@@ -766,6 +766,7 @@ class FinancialRecordRepository extends BaseRepository
[$data['count'], $data['number']] = $this->dao->getDataByType($type, $where, $date, $financialType);
$data['number'] = bcsub($data['number'], 0, 2);
} else { //平台的
+ [$data['count_order'], $data['number_order']] = $this->dao->getDataByType($type, $where, $date, ['order']);
// 退款订单
[$data['count_refund'], $data['number_refund']] = $this->dao->getDataByType($type, $where, $date, ['order_refund']);
$total = $data['number_refund'];
diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php
index 0276e2b6..7d3ae3f5 100755
--- a/crmeb/services/ExcelService.php
+++ b/crmeb/services/ExcelService.php
@@ -327,6 +327,7 @@ class ExcelService
'order_platform_coupon', 'commission_to_cloud_warehouse', 'commission_to_entry_merchant', 'commission_to_town', 'commission_to_village', 'commission_to_service_team'];
$date_ = $where['date'];
unset($where['date']);
+ /** @var FinancialRecordRepository $make */
$make = app()->make(FinancialRecordRepository::class);
$query = $make->search($where)->with(['orderInfo', 'refundOrder', 'merchant.merchantCategory']);
diff --git a/public/index.html b/public/index.html
index 0be4a057..1729f174 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,4 +2,4 @@
document.write('')
if(window.location.protocol == 'https:'){
document.write('')
- }