Merge pull request 'dev' (#106) from dev into rose

Reviewed-on: #106

app/admin/lists/user/UserLists.php

@@ -150,7 +150,8 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface,ListsS
             'store_name' => '门店',
             'total_recharge_amount' => '累计消费',
             'purchase_funds' => '采购款',
-            'format_address'=>'地址'
+            'format_address'=>'地址',
+            'vip_time'=>'开通时间'
         ];
     }
 }

app/common/enum/OrderEnum.php

@@ -47,6 +47,7 @@ class OrderEnum
 
     const PURCHASE_FUNDS = 18;//采购款收银
     const USER_ORDER_REFUND = 19;//订单返还
+    const SHARE_ORDER_OBTAINS = 20;//分享获得还
     const PAY_BACK =-1;
 
 
@@ -166,7 +167,8 @@ class OrderEnum
             self::ORDER_MARGIN=>'保证金',
             self::VIP_ORDER_OBTAINS=>'会员',
             self::OTHER_ORDER_OBTAINS=>'其他',
-            self::USER_ORDER_REFUND=>'订单返还'
+            self::USER_ORDER_REFUND=>'订单返还',
+            self::SHARE_ORDER_OBTAINS=>'分享'
 
         ];
         if ($value === true) {

app/common/logic/CommissionLogic.php

@@ -3,6 +3,7 @@
 namespace app\common\logic;
 
 use app\common\enum\OrderEnum;
+use app\common\model\store_finance_flow_product\StoreFinanceFlowProduct;
 use app\common\model\system_store\SystemStore;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
@@ -14,79 +15,81 @@ class CommissionLogic extends BaseLogic
      */
     public static function setVillage($order, $village_uid = 0, $brigade_uid = 0, $transaction_id = 0)
     {
-        $user_1 = self::user($order, 0.05, $transaction_id, $village_uid, 14); //村长
-        $user_2 = self::user($order, 0.03, $transaction_id, 0, 12); //会员、厨师
-        $user_3 = self::user($order, 0.01, $transaction_id, $brigade_uid, 15); //队长
+        self::user($order, 3, $transaction_id, $village_uid, 14); //村长
+        self::user($order, 0, $transaction_id, 0, 12); //会员、厨师
+        self::user($order, 5, $transaction_id, 0, 20); //个人店铺
+        self::user($order, 4, $transaction_id, $brigade_uid, 15); //队长
 
-        $platform = self::platform($order, 0.02, $transaction_id); //平台
-        $store = self::store($order, 0.05, $transaction_id, 0); //门店
-        $attrition = self::attrition($order, 0.02, $transaction_id, 16); //损耗
-
-        $moeny = bcadd(bcadd(bcadd(bcadd($user_1, $user_2, 2), $user_3, 2), $platform, 2), bcadd($store, $attrition, 2), 2);
-        self::suppliter($order, $moeny, $transaction_id);
+        self::platform($order, 2, $transaction_id); //平台
+        self::store($order, 1, $transaction_id, 0); //门店
+        // $attrition = self::attrition($order, 0.02, $transaction_id, 16); //损耗
+        self::suppliter($order, $transaction_id);
     }
     /**
      * 走队长分润
      */
     public static function setBrigade($order, $village_uid = 0, $brigade_uid = 0, $transaction_id = 0)
     {
-        $user_1 = self::user($order, 0.05, $transaction_id, $brigade_uid, 15); //队长
-        $user_2 = self::user($order, 0.03, $transaction_id, 0, 12); ////会员、厨师
-        $user_3 = self::user($order, 0.01, $transaction_id, $village_uid, 14); //村长
+        self::user($order, 4, $transaction_id, $brigade_uid, 15); //队长
+        self::user($order, 0, $transaction_id, 0, 12); ////会员、厨师
+        self::user($order, 5, $transaction_id, 0, 20); ////会员、厨师
+        self::user($order, 3, $transaction_id, $village_uid, 14); //村长
 
-        $platform = self::platform($order, 0.02, $transaction_id); //平台
-        $store = self::store($order, 0.05, $transaction_id, 0); //门店
-        $attrition = self::attrition($order, 0.02, $transaction_id, 16); //损耗
-
-        $moeny = bcadd(bcadd(bcadd(bcadd($user_1, $user_2, 2), $user_3, 2), $platform, 2), bcadd($store, $attrition, 2), 2);
-        self::suppliter($order, $moeny, $transaction_id);
+        self::platform($order, 2, $transaction_id); //平台
+        self::store($order, 1, $transaction_id, 0); //门店
+        // $attrition = self::attrition($order, 0.02, $transaction_id, 16); //损耗
+        self::suppliter($order, $transaction_id);
     }
     /**
      * 走厨师分润
      */
     public static function setCook($order, $village_uid = 0, $brigade_uid = 0, $transaction_id = 0)
     {
-        if($order['spread_uid']<=0){
-            $uid=$order['uid'];
-        }else{
-            $uid=$order['spread_uid'];
+        if ($order['spread_uid'] <= 0) {
+            $uid = $order['uid'];
+        } else {
+            $uid = $order['spread_uid'];
         }
-        $user_1 = self::user($order, 0.07, $transaction_id, $uid, 12); //会员、厨师
-        $user_2 = self::user($order, 0.01, $transaction_id, $village_uid, 14); //村长
-        $user_3 = self::user($order, 0.01, $transaction_id, $brigade_uid, 15); //队长
-        $platform = self::platform($order, 0.02, $transaction_id); //平台
-        $store = self::store($order, 0.05, $transaction_id, 0); //门店
-        $attrition = self::attrition($order, 0.02, $transaction_id, 16); //损耗
-        $moeny = bcadd(bcadd(bcadd(bcadd($user_1, $user_2, 2), $user_3, 2), $platform, 2), bcadd($store, $attrition, 2), 2);
-        self::suppliter($order, $moeny, $transaction_id);
+        self::user($order, 0, $transaction_id, $uid, 12); //会员、厨师
+        self::user($order, 5, $transaction_id, $uid, 20); //会员、厨师
+        self::user($order, 3, $transaction_id, $village_uid, 14); //村长
+        self::user($order, 4, $transaction_id, $brigade_uid, 15); //队长
+        self::platform($order, 2, $transaction_id); //平台
+        self::store($order, 1, $transaction_id, 0); //门店
+        // $attrition = self::attrition($order, 0.02, $transaction_id, 16); //损耗
+        // $moeny = bcadd(bcadd(bcadd(bcadd($user_1, $user_2, 2), $user_3, 2), $platform, 2), bcadd($store, 0, 2), 2);
+        self::suppliter($order, $transaction_id);
     }
 
     /**
-     * 走线下分润
+     * 零售分润
      */
-    public static function setStore($order, $transaction_id = 0)
+    public static function setStore($order, $village_uid = 0, $brigade_uid = 0, $transaction_id = 0)
     {
-        $platform = self::platform($order, 0.02, $transaction_id); //平台
-        $store = self::store($order, 0.05, $transaction_id, 0); //门店
-        $attrition = self::attrition($order, 0.01, $transaction_id, 16); //损耗
-        $moeny = bcadd(bcadd($platform, $store, 2), $attrition, 2);
-        self::suppliter($order, $moeny, $transaction_id);
+        if ($order['spread_uid'] <= 0) {
+            $uid = $order['uid'];
+        } else {
+            $uid = $order['spread_uid'];
+        }
+        self::user($order, 0, $transaction_id, $uid, 12); //会员、厨师
+        self::user($order, 5, $transaction_id, $uid, 20); //会员、厨师
+        self::user($order, 3, $transaction_id, $village_uid, 14); //村长
+        self::user($order, 4, $transaction_id, $brigade_uid, 15); //队长
+        self::platform($order, 2, $transaction_id); //平台
+        self::store($order, 1, $transaction_id, 0); //门店
+        self::suppliter($order, $transaction_id);
     }
 
 
     /**
      * 平台分润
      */
-    public static function platform($order, $platformRate, $transaction_id)
+    public static function platform($order, $type, $transaction_id)
     {
         $financeLogic = new StoreFinanceFlowLogic();
         $financeLogic->order = $order;
         $financeLogic->user['uid'] = $order['uid'];
-        $pay_price = $order['pay_price'];
-        if (isset($order['dealVipAmount']) && $order['dealVipAmount'] > 0) {
-            $pay_price = bcsub($order['pay_price'], $order['dealVipAmount'], 2);
-        }
-        $fees = bcdiv(bcmul($pay_price, $platformRate, 2), 1, 2);
+        $fees = StoreFinanceFlowProduct::where('oid', $order['id'])->where('type', $type)->sum('number');
         if ($fees > 0) {
             $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);  //平台手续费
             $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出
@@ -97,16 +100,14 @@ class CommissionLogic extends BaseLogic
     /**
      * 供应链订单获得
      */
-    public static function suppliter($order, $platformRate, $transaction_id)
+    public static function suppliter($order, $transaction_id)
     {
         $financeLogic = new StoreFinanceFlowLogic();
         $financeLogic->order = $order;
         $financeLogic->user['uid'] = $order['uid'];
         $pay_price = $order['pay_price'];
-        if (isset($order['dealVipAmount']) && $order['dealVipAmount'] > 0) {
-            $pay_price = bcsub($order['pay_price'], $order['dealVipAmount'], 2);
-        }
-        $fees = bcsub($pay_price, $platformRate, 2);
+        $number = StoreFinanceFlowProduct::where('oid', $order['id'])->sum('number');
+        $fees = bcsub($pay_price, $number, 2);
         if ($fees > 0) {
             $financeLogic->in($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
             $financeLogic->out($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
@@ -116,7 +117,7 @@ class CommissionLogic extends BaseLogic
     /**
      * 门店分润
      */
-    public static function store($order, $platformRate, $transaction_id, $uid)
+    public static function store($order, $type, $transaction_id, $uid)
     {
         $financeLogic = new StoreFinanceFlowLogic();
         $financeLogic->user['uid'] = $order['uid'];
@@ -127,11 +128,7 @@ class CommissionLogic extends BaseLogic
         //缴纳齐全了就加商户没有就加到平台
         $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find();
         $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //保证金剩余额度
-        $pay_price = $order['pay_price'];
-        if (isset($order['dealVipAmount']) && $order['dealVipAmount'] > 0) {
-            $pay_price = bcsub($order['pay_price'], $order['dealVipAmount'], 2);
-        }
-        $store_profit = bcmul($pay_price, $platformRate, 2);
+        $store_profit = StoreFinanceFlowProduct::where('oid', $order['id'])->where('type', $type)->sum('number');
         if ($deposit > 0) {
             if ($deposit > $store_profit) {
                 if ($store_profit > 0) {
@@ -159,47 +156,20 @@ class CommissionLogic extends BaseLogic
     /**
      * 分给用户
      */
-    public static function user($order, $userRate, $transaction_id, $uid = 0, $enum = 0)
+    public static function user($order, $type, $transaction_id, $uid = 0, $enum = 0)
     {
         $financeLogic = new StoreFinanceFlowLogic();
-        $pay_price = $order['pay_price'];
-        if (isset($order['dealVipAmount']) && $order['dealVipAmount'] > 0) {
-            $pay_price = bcsub($order['pay_price'], $order['dealVipAmount'], 2);
-        }
-        $fees = bcmul($pay_price, $userRate, 2);
-        if ($fees > 0) {
+        $fees = StoreFinanceFlowProduct::where('oid', $order['id'])->where('type', $type)->field('sum(number) as fees,other_uid')->find();
+        if ($fees && $fees['fees'] > 0) {
             //记录用户余额收入
-            // if ($uid) {
-                // if(in_array($enum,[14,15])&&$userRate==0.05){
-                //     $purchase_funds=User::where('id', $uid)->value('purchase_funds');
-                //     if($purchase_funds>0){
-                //         $fees_two = bcmul($purchase_funds, $userRate, 2);
-                //         if($fees_two<$fees){
-                //             $fees=$fees_two;
-                //         }
-                //     }
-                // }
-                // if($enum==12&&$userRate==0.07){
-                //     $purchase_funds=User::where('id', $uid)->value('purchase_funds');
-                //     if($purchase_funds>0){
-                //         $fees_two = bcmul($purchase_funds, $userRate, 2);
-                //         if($fees_two<$fees){
-                //             $fees=$fees_two;
-                //         }
-                //     }
-                // }
-            //     $GiveUser = User::where('id', $order['uid'])->find();
-            //     $capitalFlowDao = new CapitalFlowLogic($GiveUser);
-            //     $capitalFlowDao->userIncome('system_balance_add', 'order', $order['id'], $fees);
-            // }
             $financeLogic->user['uid'] = $order['uid'];
-            $financeLogic->other_arr['vip_uid'] = $uid;
+            $financeLogic->other_arr['vip_uid'] = $fees['other_uid'];
             $financeLogic->order = $order;
-            $financeLogic->in($transaction_id, $fees, $enum, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
-            $financeLogic->out($transaction_id, $fees, $enum, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+            $financeLogic->in($transaction_id, $fees['fees'], $enum, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+            $financeLogic->out($transaction_id, $fees['fees'], $enum, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
             $financeLogic->save();
         }
-        return $fees;
+        return $fees['fees'];
     }
 
     /**

app/common/logic/CommissionProductLogic.php

@@ -0,0 +1,175 @@
+<?php
+
+namespace app\common\logic;
+
+use app\common\model\distribution\Distribution;
+use app\common\model\store_branch_product\StoreBranchProduct;
+use app\common\model\store_finance_flow_product\StoreFinanceFlowProduct;
+use app\common\model\store_order_cart_info\StoreOrderCartInfo;
+use app\common\model\store_product\StoreProduct;
+use PDO;
+
+/**
+ * 产品佣金计算
+ * 
+ */
+class CommissionProductLogic extends BaseLogic
+{
+
+    /**
+     * 根据毛利率计算
+     */
+    function calculate_product_flow($find, $order, $village_uid = 0, $brigade_uid = 0, $user_ship = 0, $spread_user_ship = 0)
+    {
+        $product = StoreProduct::where('id', $find['product_id'])->find();
+        if ($product && $product['rose'] > 0) {
+            if (in_array($user_ship, [4, 6, 7])) {
+                $this->b($find, $order, $product);
+                return true;
+            }
+            if ($product['rose'] < 8) {
+                return false;
+            } else {
+                if($user_ship==5){
+                    $top_cate_id=StoreBranchProduct::where('product_id',$find['product_id'])->value('top_cate_id');
+                    if($top_cate_id==15189){
+                        $this->b($find, $order, $product);
+                        return true;
+                    }
+                }
+                $this->a($find, $order, $village_uid, $brigade_uid, $user_ship, $product);
+            }
+            return true;
+        }
+    }
+
+    /**
+     * 零售价结算
+     */
+    public function a($find, $order, $village_uid, $brigade_uid, $user_ship, $product)
+    {
+        $rose = bcdiv($product['rose'], 100, 2);
+        $total_price = bcmul($product['purchase'], $find['cart_num']);
+        $Distribution = Distribution::where('rate', $rose)->find();
+        //门店
+        $data[] = [
+            'store_id' => $order['store_id'],
+            'product_id' => $find['product_id'],
+            'other_uid'=>0,
+            'number' =>  bcmul($total_price, $Distribution['store'], 2),
+            'oid' => $order['id'],
+            'type' => 1,
+            'status' => 1,
+        ];
+        //平台
+        $data[] = [
+            'store_id' => $order['store_id'],
+            'product_id' => $find['product_id'],
+            'other_uid'=>0,
+            'number' =>  bcmul($total_price, $Distribution['platform'], 2),
+            'oid' => $order['id'],
+            'type' => 2,
+            'status' => 1,
+        ];
+        //村长
+        $data[] = [
+            'store_id' => $order['store_id'],
+            'product_id' => $find['product_id'],
+            'other_uid' => $village_uid,
+            'number' =>  bcmul($total_price, $Distribution['village'], 2),
+            'oid' => $order['id'],
+            'type' => 3,
+            'status' => 1,
+        ];
+        //队长
+        $data[] = [
+            'store_id' => $order['store_id'],
+            'product_id' => $find['product_id'],
+            'other_uid' => $brigade_uid,
+            'number' =>  bcmul($total_price, $Distribution['brigade'], 2),
+            'oid' => $order['id'],
+            'type' => 4,
+            'status' => 1,
+        ];
+        //会员
+        if ($user_ship == 1) {
+            $uid = $order['spread_uid'];
+        } else {
+            $uid = 0;
+        }
+        $data[] = [
+            'store_id' => $order['store_id'],
+            'product_id' => $find['product_id'],
+            'other_uid' => $uid,
+            'number' =>  bcmul($total_price, $Distribution['user'], 2),
+            'oid' => $order['id'],
+            'type' => 0,
+            'status' => 1,
+        ];
+
+        //个人店铺
+        if ($order['spread_uid'] > 0) {
+            $data[] = [
+                'store_id' => $order['store_id'],
+                'product_id' => $find['product_id'],
+                'other_uid' => $order['spread_uid'],
+                'number' =>  bcmul($total_price, $Distribution['person_store'], 2),
+                'oid' => $order['id'],
+                'type' => 5,
+                'status' => 1,
+            ];
+        }
+
+        (new StoreFinanceFlowProduct())->saveAll($data);
+    }
+
+    /**
+     * 商户价结算
+     */
+    public function b($find, $order, $product)
+    {
+        // $rose = bcdiv($product['rose'], 100, 2);
+        $total_price = bcmul($product['purchase'], $find['cart_num']);
+        $commission = bcmul($total_price, 0.02, 2);
+
+        //供货价
+        $total_cost = bcmul($product['cost'], $find['cart_num']);
+        $total = bcsub($total_cost, $total_price, 2);
+        $number = bcsub($total, $commission, 2);
+        if ($product['rose'] <= 4) {
+            //门店
+            $data = [
+                'store_id' => $order['store_id'],
+                'product_id' => $find['product_id'],
+                'other_uid'=>0,
+                'number' => $total,
+                'oid' => $order['id'],
+                'type' => 1,
+                'status' => 1,
+            ];
+            StoreFinanceFlowProduct::create($data);
+        } else {
+            //门店
+            $data[] = [
+                'store_id' => $order['store_id'],
+                'product_id' => $find['product_id'],
+                'other_uid'=>0,
+                'number' => $number,
+                'oid' => $order['id'],
+                'type' => 1,
+                'status' => 1,
+            ];
+            //平台
+            $data[] = [
+                'store_id' => $order['store_id'],
+                'product_id' => $find['product_id'],
+                'other_uid'=>0,
+                'number' => $commission,
+                'oid' => $order['id'],
+                'type' => 2,
+                'status' => 1,
+            ];
+            (new StoreFinanceFlowProduct())->saveAll($data);
+        }
+    }
+}

app/common/logic/PayNotifyLogic.php

@@ -95,7 +95,7 @@ class PayNotifyLogic extends BaseLogic
         $capitalFlowDao = new CapitalFlowLogic($user);
         $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'], '', 3, $order['store_id']);
         self::dealProductLog($order);
-   
+
         self::afterPay($order);
         if ($order['reservation'] == 1 && in_array($order['shipping_type'], [1, 2])) {
             $checkArr = [
@@ -104,7 +104,7 @@ class PayNotifyLogic extends BaseLogic
             ];
             self::dealGoodsLeft($checkArr, $order['uid'], $order['id']);
         }
-        if ($order && $order['store_id'] && $order['reservation'] !=1 && $order['source']==1) {
+        if ($order && $order['store_id'] && $order['reservation'] != 1 && $order['source'] == 1) {
             $params = [
                 'verify_code' => $order['verify_code'],
                 'store_id' => $order['store_id'],
@@ -112,7 +112,7 @@ class PayNotifyLogic extends BaseLogic
             ];
             OrderLogic::writeOff($params);
         }
-        if(in_array($order['shipping_type'],[1,2])){
+        if (in_array($order['shipping_type'], [1, 2])) {
             PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
         }
         return  true;
@@ -201,7 +201,7 @@ class PayNotifyLogic extends BaseLogic
         //        }
         // self::addUserSing($order);
         self::afterPay($order);
-        if ($order && $order['store_id'] && $order['reservation'] !=1 && $order['source']==1) {
+        if ($order && $order['store_id'] && $order['reservation'] != 1 && $order['source'] == 1) {
             $params = [
                 'verify_code' => $order['verify_code'],
                 'store_id' => $order['store_id'],
@@ -219,7 +219,7 @@ class PayNotifyLogic extends BaseLogic
         }
 
         // Redis::send('push-platform-print', ['id' => $order['id']], 60);
-        if(in_array($order['shipping_type'],[1,2])){
+        if (in_array($order['shipping_type'], [1, 2])) {
             PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
         }
     }
@@ -438,7 +438,7 @@ class PayNotifyLogic extends BaseLogic
         $uid = $order->uid;
         $user = User::where('id', $uid)->findOrEmpty();
         //check store_id
-        if($user->store_id==0){
+        if ($user->store_id == 0) {
             $user->store_id = $order['store_id'];
         }
 
@@ -455,7 +455,7 @@ class PayNotifyLogic extends BaseLogic
 
         //更新等级
         $user->user_ship = $order['user_ship'];
-        if($user['vip_time']==null){
+        if ($user['vip_time'] == null) {
             $user->vip_time = time();
         }
         $user->purchase_funds = bcadd($user->purchase_funds, $price, 2);
@@ -487,7 +487,7 @@ class PayNotifyLogic extends BaseLogic
         $order->paid = 1;
         $order->pay_time = time();
         $order->status = 2;
-        if ($order['reservation'] ==1) {
+        if ($order['reservation'] == 1) {
             $order->status = 1;
         }
         if (!$order->save()) {
@@ -501,7 +501,7 @@ class PayNotifyLogic extends BaseLogic
         $cashFlowLogic->insert($order['store_id'], $order['pay_price']);
         self::dealProductLog($order);
 
-        if ($order && $order['store_id'] && $order['reservation'] !=1) {
+        if ($order && $order['store_id'] && $order['reservation'] != 1) {
             $params = [
                 'verify_code' => $order['verify_code'],
                 'store_id' => $order['store_id'],
@@ -569,6 +569,7 @@ class PayNotifyLogic extends BaseLogic
         $village_uid = 0;
         $brigade_uid = 0;
         $user_ship = 0;
+        $spread_user_ship = 0;
         $order['dealVipAmount'] = 0;
         try {
             if($order['uid']!=1){
@@ -583,10 +584,9 @@ class PayNotifyLogic extends BaseLogic
             //用户下单该用户等级为1得时候才处理冻结金额
             $user = User::where('id', $order['uid'])->find();
             $user_ship = $user['user_ship'];
-
         }
         //积分写入
-        if(isset($user) && $user['user_ship']==0){
+        if (isset($user) && $user['user_ship'] == 0) {
             UserSignLogic::OrderWrite($order);
         }
         if ($off_activity == 1) {
@@ -604,43 +604,28 @@ class PayNotifyLogic extends BaseLogic
         // if ($user_ship>0 && $order['pay_type'] != PayEnum::CASH_PAY && $off_activity !=1) {
         //     $order['dealVipAmount']= self::dealVipAmount($order,  $order['pay_type']);
         // }
-        if ($order['spread_uid'] > 0 || $user_ship > 0) {
-            if ($order['spread_uid'] > 0 && $user_ship == 0) {
-                $user_ship = User::where('id', $order['spread_uid'])->value('user_ship');
-                if ($user_ship == 2) {
-                    $village_uid = $order['spread_uid'];
-                    $address = UserAddress::where(['uid' => $order['spread_uid'], 'is_default' => 1])->find();
-                    if ($address) {
-                        $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid');
-                        if ($arr2) {
-                            $brigade_uid = User::where('id', 'in', $arr2)->where('user_ship', 3)->value('id') ?? 0;
-                        }
+        if ($order['spread_uid'] > 0 && $user_ship == 0) {
+            $spread_user_ship = User::where('id', $order['spread_uid'])->value('user_ship');
+            if ($spread_user_ship == 2) {
+                $village_uid = $order['spread_uid'];
+                $address = UserAddress::where(['uid' => $order['spread_uid'], 'is_default' => 1])->find();
+                if ($address) {
+                    $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid');
+                    if ($arr2) {
+                        $brigade_uid = User::where('id', 'in', $arr2)->where('user_ship', 3)->value('id') ?? 0;
                     }
-                } elseif ($user_ship == 3) {
-                    $brigade_uid = $order['spread_uid'];
-                    $address = UserAddress::where(['uid' => $order['spread_uid'], 'is_default' => 1])->find();
-                    if ($address) {
-                        $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid');
-                        if ($arr1) {
-                            $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id') ?? 0;
-                        }
-                    }
-                }else{
-                    $address = UserAddress::where(['uid' => $order['spread_uid'], 'is_default' => 1])->find();
-                    if ($address) {
-                        $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid');
-                        if ($arr1) {
-                            $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id') ?? 0;
-                        }
-                        $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid');
-                        if ($arr2) {
-                            $brigade_uid = User::where('id', 'in', $arr2)->where('user_ship', 3)->value('id') ?? 0;
-                        }
+                }
+            } elseif ($spread_user_ship == 3) {
+                $brigade_uid = $order['spread_uid'];
+                $address = UserAddress::where(['uid' => $order['spread_uid'], 'is_default' => 1])->find();
+                if ($address) {
+                    $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid');
+                    if ($arr1) {
+                        $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id') ?? 0;
                     }
                 }
             } else {
-                //查询用户对应的村长和队长
-                $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find();
+                $address = UserAddress::where(['uid' => $order['spread_uid'], 'is_default' => 1])->find();
                 if ($address) {
                     $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid');
                     if ($arr1) {
@@ -652,28 +637,27 @@ class PayNotifyLogic extends BaseLogic
                     }
                 }
             }
-            switch ($user_ship) {
-                case 1: // 厨师
-                //case 4: // 商户
-                //case 5: // 种养殖
-                // case 6: // 酒店
-                // case 7: // 食堂
-                case 8: // 一条龙
-                    CommissionLogic::setCook($order, $village_uid, $brigade_uid, $transaction_id);
-                    break;
-                case 2: // 村长
-                    CommissionLogic::setVillage($order, $village_uid, $brigade_uid, $transaction_id);
-                    break;
-                case 3: // 队长
-                    CommissionLogic::setBrigade($order, $village_uid, $brigade_uid, $transaction_id);
-                    break;
-                default:
-                    CommissionLogic::setStore($order, $transaction_id);
-                    break;
-            }
         } else {
-            CommissionLogic::setStore($order, $transaction_id);
+            //查询用户对应的村长和队长
+            $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find();
+            if ($address) {
+                $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid');
+                if ($arr1) {
+                    $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id') ?? 0;
+                }
+                $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid');
+                if ($arr2) {
+                    $brigade_uid = User::where('id', 'in', $arr2)->where('user_ship', 3)->value('id') ?? 0;
+                }
+            }
         }
+        $info = StoreOrderCartInfo::where('oid', $order['id'])->field('store_id,product_id,cart_num')->select();
+        $comm = new CommissionProductLogic();
+        foreach ($info as $k=>$v) {
+            $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid,$user_ship,$spread_user_ship);
+        }
+        CommissionLogic::setStore($order,$village_uid, $brigade_uid, $transaction_id);
+        return true;
     }
 
     /**

app/common/model/distribution/Distribution.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\model\distribution;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 角色分润规则模型
+ * Class distribution
+ * @package app\common\model\order
+ */
+class Distribution extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'distribution';
+    protected $deleteTime = 'delete_time';
+
+    
+}

app/common/model/store_finance_flow_product/StoreFinanceFlowProduct.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\common\model\store_finance_flow_product;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 财务流水商品明细
+ * Class StoreFinanceFlowProduct
+ * @package app\common\model\store_finance_flow_product
+ */
+class StoreFinanceFlowProduct extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'store_finance_flow_product';
+    protected $deleteTime = 'delete_time';
+}