Merge branch 'tuancan' into develop

application/services/common/KafkaService.php

@@ -14,6 +14,11 @@ class KafkaService
      */
     public static function productMarketingUpdate(array $marketingInfo) : void
     {
+        if ($marketingInfo['userId'] == '17963416161910792')
+        {
+            return;
+        }
+
         $msg = json_encode([
             'marketingInfo' => $marketingInfo,
             'time' => time(),

application/services/marketing/MarketingService.php

@@ -1036,6 +1036,16 @@ class MarketingService
         return $info;
     }
 
+    /**
+     * 获取生活号加入生活圈天数
+     * @param $createTime
+     * @return false|float
+     */
+    private static function countAccountRegisterDays($createTime)
+    {
+        return ceil((time() - strtotime($createTime)) / 86400);
+    }
+
     /**
      * 拼单活动详情
      * @param $params
@@ -1064,8 +1074,10 @@ class MarketingService
 
         $marketingData["life_account_name"] = $marketingData["life_account_icon"] = "";
         if (!empty($lifeAccountList[$pindanMarketing["publish_life_account_id"]])) {
+            $marketingData["life_account_admin_id"] = strval($lifeAccountList[$pindanMarketing["publish_life_account_id"]]["life_account_admin_id"]);//客户端需要字符串格式
             $marketingData["life_account_name"] = $lifeAccountList[$pindanMarketing["publish_life_account_id"]]["life_account_name"];
             $marketingData["life_account_icon"] = $lifeAccountList[$pindanMarketing["publish_life_account_id"]]["life_account_icon"];
+            $marketingData["life_account_register_days"] = self::countAccountRegisterDays($lifeAccountList[$pindanMarketing["publish_life_account_id"]]['create_time']);
         }
         $marketingData["id"] = $marketingInfo["marketing_id"];
         $marketingData["marketing_name"] = $marketingInfo["marketing_name"];
@@ -1162,6 +1174,7 @@ class MarketingService
         return $info;
     }
 
+
     public static function getMarketingList($params)
     {
         $where['marketing_id'] = !empty($params['marketing_id']) ? $params['marketing_id'] : '';