更新h5页面，修改订单金额的错误

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']);

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'];

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']);

public/index.html

@@ -2,4 +2,4 @@
             document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
 						if(window.location.protocol == 'https:'){
 							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
-						}</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c6349b23.js></script><script src=/static/js/index.27199934.js></script></body></html>
+						}</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c6349b23.js></script><script src=/static/js/index.4a7caa24.js></script></body></html>