From 88c9fd557cb1dd3d6a3a5dbdd80012d966f54e18 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 19 Sep 2024 11:17:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E4=BA=86=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BD=A3=E9=87=91=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=8D=9F=E8=80=97=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=96=B0=E4=BA=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/CommissionProductLogic22.php | 22 ++++++++++++-------
 .../StoreCashFinanceFlowLists.php             |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/common/logic/CommissionProductLogic22.php b/app/common/logic/CommissionProductLogic22.php
index f9ae6446..46a95dca 100644
--- a/app/common/logic/CommissionProductLogic22.php
+++ b/app/common/logic/CommissionProductLogic22.php
@@ -72,9 +72,6 @@ class CommissionProductLogic22 extends BaseLogic
         if ($product['rose'] >= 6) {
             $platform_number = bcmul($total_price, 0.02, 2); //平台
         }
-        if ($product['rose'] >= 12) {
-            $attrition_number = bcmul($total_price, 0.02, 2); //损耗
-        }
         //零售-供货价
         $number3 = bcsub($total_price, $purchase_price, 2);
         //会员
@@ -92,20 +89,28 @@ class CommissionProductLogic22 extends BaseLogic
                 $village_number = bcmul($total_price, 0.04, 2); //村长利润
                 $data[] =$this->village('零售村长', $order, $find, $village_uid, $price, $total_price, $village_number,0.04);
                 $number1 = bcadd($number1, $village_number, 2);
+                if ($product['rose'] >= 12) {
+                    $attrition_number = bcmul($total_price, 0.02, 2); //损耗
+                    $data[] =$this->attrition('零售损耗', $order, $find, $price, $total_price,$attrition_number);
+                }
             } elseif ($user['user_ship'] == 3) {
                 $brigade_number = bcmul($total_price, 0.04, 2); //队长利润
                 $data[] = $this->brigade('零售队长', $order, $find, $brigade_uid, $price, $total_price, $brigade_number,0.04);
                 $number1 = bcadd($number1, $brigade_number, 2);
-                if ($product['rose'] >= 13 && $village_uid>0) {
+                if ($product['rose'] >= 12 && $village_uid>0) {
                     $village_number = bcmul($total_price, 0.01, 2); //村长利润
                     $data[] =$this->village('零售村长', $order, $find, $village_uid, $price, $total_price, $village_number,0.01);
                     $number1 = bcadd($number1, $village_number, 2);
                 }
+                if ($product['rose'] >= 15) {
+                    $attrition_number = bcmul($total_price, 0.02, 2); //损耗
+                    $data[] =$this->attrition('零售损耗', $order, $find, $price, $total_price,$attrition_number);
+                }
             } elseif ($user['user_ship'] == 1) {
                 $vip_number = bcmul($total_price, 0.06, 2); //会员利润
                 $data[] = $this->vip_user('零售会员', $order, $find, $uid, $price, $total_price, $vip_number,0.06);
                 $number1 = bcadd($number1, $vip_number, 2);
-                if ($product['rose'] >= 13 && $village_uid>0) {
+                if ($product['rose'] >= 12 && $village_uid>0) {
                     $village_number = bcmul($total_price, 0.01, 2); //村长利润
                     $data[] =$this->village('零售村长', $order, $find, $village_uid, $price, $total_price, $village_number,0.01);
                     $number1 = bcadd($number1, $village_number, 2);
@@ -115,6 +120,10 @@ class CommissionProductLogic22 extends BaseLogic
                     $data[] =$this->village('零售队长', $order, $find, $village_uid, $price, $total_price, $brigade_number,0.01);
                     $number1 = bcadd($number1, $brigade_number, 2);
                 }
+                if ($product['rose'] >= 15) {
+                    $attrition_number = bcmul($total_price, 0.02, 2); //损耗
+                    $data[] =$this->attrition('零售损耗', $order, $find, $price, $total_price,$attrition_number);
+                }
             }
         }
         //门店利润
@@ -134,9 +143,6 @@ class CommissionProductLogic22 extends BaseLogic
         if ($product['rose'] >= 6) {
             $data[] = $this->platform('零售平台', $order, $find, $price, $total_price,$platform_number);
         }
-        if ($product['rose'] >= 12) {
-            $data[] =$this->attrition('零售损耗', $order, $find, $price, $total_price,$attrition_number);
-        }
 
         (new StoreFinanceFlowProduct())->saveAll($data);
     }
diff --git a/app/store/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php b/app/store/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php
index a1d1ff1a..9681a66a 100644
--- a/app/store/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php
+++ b/app/store/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php
@@ -45,7 +45,7 @@ class StoreCashFinanceFlowLists extends BaseAdminDataLists implements ListsSearc
     {
         $this->searchWhere[]=['store_id','=',$this->adminInfo['store_id']];
         return StoreCashFinanceFlow::where($this->searchWhere)
-            ->field(['id', 'store_id', 'cash_price', 'receivable', 'receipts', 'admin_id', 'file', 'remark', 'status'])
+            ->field(['id', 'store_id', 'cash_price', 'receivable', 'receipts', 'admin_id', 'file','create_time', 'remark', 'status'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) {