Merge branch 'pre_release' into 'master'

Pre release

See merge request bp/goods!67

application/services/marketing/MarketingService.php

@@ -1053,6 +1053,16 @@ class MarketingService
         return $info;
     }
 
+    /**
+     * 获取生活号加入生活圈天数
+     * @param $createTime
+     * @return false|float
+     */
+    private static function countAccountRegisterDays($createTime)
+    {
+        return ceil((time() - strtotime($createTime)) / 86400);
+    }
+
     /**
      * 拼单活动详情
      * @param $params
@@ -1181,6 +1191,7 @@ class MarketingService
         return $info;
     }
 
+
     public static function getMarketingList($params)
     {
         $where['marketing_id'] = !empty($params['marketing_id']) ? $params['marketing_id'] : '';