From 45cd64669ae6dc507e87d7575867efd1d30a13ce Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Sun, 30 Apr 2023 12:07:38 +0800
Subject: [PATCH] market_order

---
 market/controllers/api/sylive/GroupsOrder.php | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/market/controllers/api/sylive/GroupsOrder.php b/market/controllers/api/sylive/GroupsOrder.php
index b57ca203..8f6d580c 100644
--- a/market/controllers/api/sylive/GroupsOrder.php
+++ b/market/controllers/api/sylive/GroupsOrder.php
@@ -134,6 +134,7 @@ class groupsOrder extends BaseController
                 ];
                 if ($limit == 10000) {
                     unset($list1['id']);
+                    $list1['consultantMobile'] = $consultant['consultantMobile'];
                 } else {
                     unset($list1['sid']);
                 }
@@ -159,7 +160,8 @@ class groupsOrder extends BaseController
             }
         }
         if ($limit == 10000) {
-            $columns1 = ['订单号', '姓名', '手机号', '商品标题', '订单价格', '付款时间', '创建时间', '订单类型', '状态', '内部人员', '顾问'];
+            $columns1 = ['订单号', '姓名', '手机号', '商品标题', '订单价格', '付款时间', '创建时间', '订单类型', '状态', '内部人员'
+                , '顾问', '顾问手机号'];
             $columns2 = [];
             foreach ($levels as $k => $v) {
                 $columns2[] = $v['label'];
@@ -203,7 +205,7 @@ class groupsOrder extends BaseController
      */
     private function consultantGet($params)
     {
-        $stores = $consultant = $levelName1 = $levelName2 = $levelName3 = '';
+        $stores = $consultant = $consultantMobile = $levelName1 = $levelName2 = $levelName3 = '';
         $levelId1 = intval($params['levelId1']);
         $levelId2 = intval($params['levelId2']);
         $levelId3 = intval($params['levelId3']);
@@ -234,8 +236,11 @@ class groupsOrder extends BaseController
             $res_org['groupsName'] && $levelName3 = $res_org['groupsName'];
         }
         $re_user = $this->mdSyliveUser->get(['userId' => $cfUserId]);
-        $re_user['uname'] && $consultant = $re_user['uname'];
-        return ['stores' => $stores, 'consultant' => $consultant, 'levelName1' => $levelName1,
+        if($re_user['uname']){
+            $consultant = $re_user['uname'];
+            $consultantMobile = $re_user['mobile'];
+        }
+        return ['stores' => $stores, 'consultant' => $consultant,'consultantMobile' => $consultantMobile, 'levelName1' => $levelName1,
             'levelName2' => $levelName2, 'levelName3' => $levelName3];
     }
 
@@ -278,12 +283,21 @@ class groupsOrder extends BaseController
         $done = 0;
         for ($_row = 2; $_row <= $rowCnt; $_row++) {  //读取内容
             $mobile = $objWorksheet->getCell('B' . $_row)->getValue();
+            $addData["itemTitle"] = $objWorksheet->getCell('D' . $_row)->getValue();
             if ($mobile) {
-                $re_order = $this->mdSyliveOrder->get(['mobile' => $mobile, "activityId" => $activityId]);
+                $where = ['mobile' => $mobile, "activityId" => $activityId];
+                if ($addData["itemTitle"]) {
+                    $re_order = $this->mdSyliveItems->get(['title' => $addData["itemTitle"], "activityId" => $activityId]);
+                    if ($re_order) {
+                        $where["itemId"] = $re_order['itemId'];
+                        $addData["itemId"] = $re_order['itemId'];
+                        $addData["itemPrice"] = $re_order['price'];
+                    }
+                }
+                $re_order = $this->mdSyliveOrder->get($where);
                 if (!$re_order) {
                     $addData["uname"] = $objWorksheet->getCell('A' . $_row)->getValue();
                     $addData["totalPrice"] = $objWorksheet->getCell('C' . $_row)->getValue();
-                    $addData["itemTitle"] = $objWorksheet->getCell('D' . $_row)->getValue();
                     $addData["createTime"] = $objWorksheet->getCell('E' . $_row)->getValue();
                     $bizName = $objWorksheet->getCell('F' . $_row)->getValue();
                     $cfMobile = $objWorksheet->getCell('H' . $_row)->getValue();
@@ -291,13 +305,6 @@ class groupsOrder extends BaseController
                     $addData["status"] = 1;
                     $addData["activityId"] = $activityId;
                     $addData["sid"] = create_order_no('350200', 'market');
-                    if ($addData["itemTitle"]) {
-                        $re_order = $this->mdSyliveItems->get(['title' => $addData["itemTitle"], "activityId" => $activityId]);
-                        if ($re_order) {
-                            $addData["itemId"] = $re_order['itemId'];
-                            $addData["itemPrice"] = $re_order['price'];
-                        }
-                    }
                     if ($cfMobile) {
                         $re_user = $this->mdSyliveUser->get(['mobile' => $cfMobile, 'organizationId>' => 0, 'status<>' => -1]);
                         if ($re_user['userId']) {