Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Admin/Dream/InfoController.php

@@ -44,6 +44,7 @@ class InfoController extends Controller
         $setting = BaseSettingsModel::where('category','paihang')->first();
         $a = $setting?$setting->key:1;
         $x = $setting?$setting->sort:10;
+        if($x==0) $x = 10;
         foreach ($list as $item) {
 //            $b = $item->parameter;
             $t = 21*24*60; //梦想发布分钟数

server/app/Http/Controllers/Api/V1/AuthController.php

@@ -313,7 +313,7 @@ class AuthController extends Controller
         $keyexist = $this->keySmsCodeExist . $phone;
         $times = Cache::store('file')->get($keyexist);
 
-        if($times>40) {
+        if($times>60) {
             return $this->error(ErrorCode::VERIFY_CODE_TOO_MUCH);
         }else{
             $times++;

server/app/Http/Controllers/Api/V1/DreamController.php

@@ -351,7 +351,7 @@ class DreamController extends Controller
                         "score": 5062
                     }
                 ]
-            "number": 4.8
+            "number": 4.8           支持乘数
             "is_collection" : 1              1已收藏   0未收藏
 
     }
@@ -411,7 +411,7 @@ class DreamController extends Controller
         $n = count($setting) > 0 ? $setting->sort : 0;
         //Todo 支持乘数目公式      pow(x,y)
 //        exp(x)     $number =  N*exp(-a*(pow(t,1/b)))+1
-        $number =round( -$a * $b + $c,1);
+        $number =round( $n*exp(-$a*(pow($b,1/$c)))+1,2);
         if ($number <= 1) $number = 1;
 
         if ($user->coin < $coin) {
@@ -444,6 +444,29 @@ class DreamController extends Controller
             $dream->get_coin += $coin;
             $dream->mark += $coin*$number;
             $dream->save();
+            $to_user = $dream->user;
+//            支持成功记录交易记录
+            if (!empty($to_user)) {
+                $arr = [
+                    'from_type'=>'梦想币',
+                    'from_id'=>$user->id,
+                    'from_name'=>$user->nickname,
+                    'op'=>'消耗',
+                    'from_amount'=>$coin,
+                    'to_type'=>'梦想币',
+//                    'to_id'=>$dream->user_id,
+                    'to_id'=>'',
+                    'to_name'=>$to_user->nickname,
+                    'to_amount'=>$coin,
+                    'channel'=>'平台内',
+                    'transaction_id'=>date('YmdHis') . mt_rand(1000, 9999),
+                    'avatar'=>$user->avatar,
+                ];
+                AccountLog::create($arr);
+            }
+
+
+
 
             //            梦想实现创建二维码
             if ($dream->coin >= $dream->get_coin && empty($dream->code)) {
@@ -515,7 +538,7 @@ class DreamController extends Controller
             $dream->top3user = $top3user;
             $dream->is_collection = $is_collection;
             $user_coin = $user->coin;
-            return $this->api(compact('dream','user_coin'));
+            return $this->api(compact('dream','user_coin','number'));
         }
     }
 
@@ -641,8 +664,10 @@ class DreamController extends Controller
         $a = $setting?$setting->key:1;
         $b = $dream->parameter;
         $x = $setting?$setting->sort:10;
+        if($x==0) $x=10;
         $t = 21*24*60; //梦想发布分钟数
         $care_num = UserCareDream::where('dream_id',$dream->id)->get()->count();
+        if ($care_num==0) $care_num=1;
         $score = (log($care_num,$x) + ($a/$t) + $b)*100000000000000 ;
         $dream->score = $score;
         $dream->save();

server/app/Http/Controllers/Api/V1/HomeController.php

@@ -165,7 +165,7 @@ class HomeController extends Controller
             if (empty($user_care_user)) {
                 UserCareUser::create($data);
 //                关注成功发送私信
-                $message = BaseSettingsModel::where('category','message')->first();
+               /* $message = BaseSettingsModel::where('category','message')->first();
                 $message = empty($message) ? '' : $message->value;
                 $info = [
                     'user_id'=>$request->id,
@@ -174,7 +174,7 @@ class HomeController extends Controller
                 ];
                 SystemInfoModel::create($info);
                 //            长连接
-                $this->jPush($message,'',$user->id);
+                $this->jPush($message,'',$user->id);*/
             }
 
         }else{

server/app/Http/Controllers/Api/V1/IndexController.php

@@ -12,6 +12,8 @@ use App\Models\UserCareDream;
 use App\Models\UserCareUser;
 use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
 class IndexController extends Controller
 {
 
@@ -114,8 +116,10 @@ class IndexController extends Controller
         $id_arr1 = array_column($arr1,'id');
         $arr2 =DreamInfoModel::orderBy('score','desc')->offset(15)->limit(120)->select('id')->get()->toArray();
         $id_arr2 = array_column($arr2,'id');
+//        首页显示用户条件 关注的梦想有新的动态 2动态下有新的评论
         $users_care_dream = UserCareDream::where('user_id',$id)->where('interaction_number','>',0)->get()->toArray();
         $user_ids = array_unique(array_column($users_care_dream,'dream_user_id','dream_id'));
+        Log::info($user_ids);
         $users = [] ;
         if (!empty($user_ids)) {
             foreach ($user_ids as $dream_id => $user_id) {

server/app/Http/Controllers/Api/V1/InteractionController.php

@@ -93,7 +93,7 @@ class InteractionController extends Controller
                     $this->jPush($arr['message'],'',$user_id);
                 }
             }
-//            收藏梦想最新动态加一
+//            收藏梦想的最新动态加一
             UserCareDream::where('dream_id',$dream_id)->increment('interaction_number',1);
             $dream_user_id = DreamInfoModel::find($dream_id)->user_id;
             UserCareUser::where('other_user_id',$dream_user_id)->update(['dream_id'=>$dream_id,'dream_number'=>'1']);
@@ -209,6 +209,8 @@ class InteractionController extends Controller
 
 
         if ($ok) {
+//            评论动态也会出现在首页用户
+            UserCareDream::where('dream_id',$dream_id)->increment('interaction_number',1);
             return $this->api('');
         }else{
             return $this->error(ErrorCode::OPERATION_FAILED);

server/resources/views/admin/account_log/index.blade.php

@@ -18,7 +18,7 @@
     						<tr>
 								
             <th  data-sort="to_type"> 充值类型 </th>
-            <th  data-sort="note"> 交易号 </th>
+            <th  data-sort="transaction_id"> 交易号 </th>
             <th  data-sort="to_amount"> 充值金额 </th>
             <th  data-sort="created_at"> 充值时间 </th>
         						{{--<th width="22%">相关操作</th>--}}
@@ -29,7 +29,7 @@
 							@foreach($list as $key => $item)
 								<tr>
 									<td>{{ $item->to_type }}</td>
-									<td>{{ $item->note }}</td>
+									<td>{{ $item->transaction_id }}</td>
 									<td>{{ $item->to_amount }}</td>
 									<td>{{ $item->created_at }}</td>
 									{{--<td>