From 2f4165b3e5b0dd10bf3b578d94e266ac77ffb8fd Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Fri, 22 Jul 2022 10:37:36 +0800
Subject: [PATCH] blindbox_722

---
 api/controllers/wxapp/liche/Blindbox.php       | 4 ++--
 api/controllers/wxapp/licheb/Customers.php     | 2 +-
 common/libraries/receiver/Customers_entity.php | 7 ++++++-
 home/controllers/h5/Persona.php                | 9 ++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/api/controllers/wxapp/liche/Blindbox.php b/api/controllers/wxapp/liche/Blindbox.php
index 78e43985..982d20de 100644
--- a/api/controllers/wxapp/liche/Blindbox.php
+++ b/api/controllers/wxapp/liche/Blindbox.php
@@ -88,7 +88,7 @@ class Blindbox extends Wxapp
         if ($prizes_item) {
             $img = $prizes_item['img_value'] ? build_qiniu_image_url($prizes_item['img_value']) : '';
             $credit = intval($prizes_item['credit']);
-            $winning = ['title' => $prizes_item['title'], 'img' => $img, 'value' => "抽到{$credit}积分！"];
+            $winning = ['title' => $prizes_item['title'], 'img' => $img, 'value' => "抽到{$credit}积分"];
             $this->load->library('entity/credits_entity');//加积分
             $jsondata = ['id' => $prizes_item['id'], 'title' => $prizes_item['title'], 'credit' => $prizes_item['credit']];
             //积分变动
@@ -99,7 +99,7 @@ class Blindbox extends Wxapp
             //冻结资金
             $this->credits_entity->freeze($this->myuid, $credit, 0);
         }
-        $info = ['title' => '恭喜您！', 'winning_ins' => $prizes['winning_ins'], 'winning' => $winning];
+        $info = ['title' => '恭喜您', 'winning_ins' => $prizes['winning_ins'], 'winning' => $winning];
         return $info;
     }
 
diff --git a/api/controllers/wxapp/licheb/Customers.php b/api/controllers/wxapp/licheb/Customers.php
index 638eeb89..619441ca 100644
--- a/api/controllers/wxapp/licheb/Customers.php
+++ b/api/controllers/wxapp/licheb/Customers.php
@@ -746,7 +746,7 @@ class Customers extends Wxapp
                 }
                 $addData = ['rid' => $re['rid'], 'name' => $re['name'], 'mobile' => $re['mobile'], 'biz_id' => $biz_id
                     , 'cs_biz_id' => $re['biz_id'], 'level' => $re['level'], 'cf_title' => $re['cf_title'], 'cf_id' => $re['cf_id']
-                    , 'of_id' => $re['of_id'], 'of2_id' => $re['of2_id'], 'status' => 1, 'c_time' => time(), 'city_id' => $re['city_id']
+                    , 'of_id' => $re['of_id'], 'of2_id' => $re['of2_id'], 'status' => $re['status'], 'c_time' => time(), 'city_id' => $re['city_id']
                     , 'county_id' => $re['county_id']];
                 $re['jsondata'] && $addData['jsondata'] = $re['jsondata'];
                 $customer_id = $this->customers_model->add($addData);
diff --git a/common/libraries/receiver/Customers_entity.php b/common/libraries/receiver/Customers_entity.php
index 6b56edb4..7ec618cb 100644
--- a/common/libraries/receiver/Customers_entity.php
+++ b/common/libraries/receiver/Customers_entity.php
@@ -36,8 +36,13 @@ class Customers_entity
             $result = $this->add_log($customer_id, $uid, $uname, $content, $type, $cf_platform, $imgs);
         }
         if ($visit && ($result || !$content)) {//更新客户已跟进
+            if ($type == 1 || $type == 2) {//1发短信2拨打号码 不算入已跟进
+                return $result;
+            }
+            //更新已更进状态
             $this->ci->load->model('receiver/receiver_customers_visit_data_model', 'mdCustomerVisitData');
-            $result = $this->ci->mdCustomerVisitData->update(['status' => 2], ['c_id' => $customer_id, 'sales_id' => $uid, 't_day' => date('Y-m-d')]);
+            $result = $this->ci->mdCustomerVisitData->update(['status' => 2], ['c_id' => $customer_id,
+                'sales_id' => $uid, 't_day' => date('Y-m-d')]);
         }
         return $result;
     }
diff --git a/home/controllers/h5/Persona.php b/home/controllers/h5/Persona.php
index 998c2adc..731d8f68 100644
--- a/home/controllers/h5/Persona.php
+++ b/home/controllers/h5/Persona.php
@@ -111,7 +111,7 @@ class Persona extends CI_Controller
                 }
             }
         }
-        $avatar = $mobile = $name = $unionid = '';
+        $avatar = $mobile = $name = $unionid  = '';
         $gender = $biz_id = 0;
         if ($remark_mobiles && $remark_mobiles != '[]' && is_array($remark_mobiles)) {
             $mobile = $remark_mobiles[0];//取第一个手机号
@@ -178,11 +178,10 @@ class Persona extends CI_Controller
             }
         }
         //线索来源
-        $status = 0;
         $offline_sources = $this->mdCustomers->offlineSources();
-        if (strlen($status) && $status == 0) {//未见客户
-            unset($offline_sources[1]);
-        }
+//        if (strlen($status) && $status == 0) {//未见客户
+//            unset($offline_sources[1]);
+//        }
         $ii = 0;
         $description_arr = $description ? explode('-', $description) : [];
         foreach ($offline_sources as $key => $val) {