From 2feea0369bf249313d3eabeaedf9c2e4978c2fef Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sun, 21 Jan 2024 17:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E9=80=81=E5=91=98?=
 =?UTF-8?q?=E5=88=86=E6=B6=A6=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 3 ---
 app/controller/merchant/store/order/StoreOrderBehalf.php     | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 7db41939..b3cc6d69 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -509,9 +509,6 @@ class StoreOrderRepository extends BaseRepository
                     $addressCode = explode(',', $order['user_address_code']);
                     // "惠农供销，谱写数字新篇章"活动首单分润，镇合伙人
                     (new CommissionDao())->sendCommission($order, $addressCode[3], 3);
-                    if ($order['order_type'] && !empty($order['logistics_phone'])) {
-                        (new CommissionDao())->sendCommission($order, $order['logistics_phone'], 4);
-                    }
                 }
             }
             //分销判断
diff --git a/app/controller/merchant/store/order/StoreOrderBehalf.php b/app/controller/merchant/store/order/StoreOrderBehalf.php
index cd72929f..95bb66df 100644
--- a/app/controller/merchant/store/order/StoreOrderBehalf.php
+++ b/app/controller/merchant/store/order/StoreOrderBehalf.php
@@ -15,6 +15,7 @@ namespace app\controller\merchant\store\order;
 
 
 
+use app\common\dao\store\consumption\CommissionDao;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\order\StoreOrderOther;
 use crmeb\basic\BaseController;
@@ -144,9 +145,11 @@ class StoreOrderBehalf extends BaseController
         // $find = Db::name('store_order_other')->where('uid', $uid)->where('order_id', $id)->find();
         // $find_two = Db::name('store_order')->where('order_sn', $find['order_sn'])->find();
         if($res){
-            $order = StoreOrder::where('order_sn', $orderOther['order_sn'])->field('user_phone,order_type,logistics_code')->find()->toArray();
+            $order = StoreOrder::where('order_sn', $orderOther['order_sn'])->field('user_phone,order_type,logistics_code,logistics_phone')->find()->toArray();
             if($status==3 && $order['order_type'] == 1){
                 SmsService::create()->send($order['user_phone'], 'RECEIVE_NOTICE', ['code' => $order['logistics_code'], 'name' => $merchant['mer_name']]);
+            } elseif($status==3 && $order['order_type'] != 1){
+                (new CommissionDao())->sendCommission($order, $order['logistics_phone'], 4);
             }
             return app('json')->success('设置成功');
         }else{