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

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

@@ -41,7 +41,19 @@ class InfoController extends Controller
             $query = $query->pushCriteria(new OrderBy('id','desc'));
         }
         $list = $query->with(['meet'])->paginate();
-        $ab_value = BaseSettingsModel::where('category','paihang')->first();
+        $setting = BaseSettingsModel::where('category','paihang')->first();
+        $a = $setting?$setting->key:1;
+        $x = $setting?$setting->sort:10;
+        foreach ($list as $item) {
+//            $b = $item->parameter;
+            $t = 21*24*60; //梦想发布分钟数
+            $care_num = UserCareDream::where('dream_id',$item->id)->get()->count();
+            if ($care_num==0) $care_num=1;
+//            $score = (log($care_num,$x) + ($a/$t) + $b)*100000000000000 ;
+            $item->x = log($care_num,$x);
+            $item->y = $a/$t;
+            $item->score =  $item->score/100000000000000;
+        }
         return view('admin.dream.info.index',compact('list','ab_value'));
     }
 

server/app/Http/Controllers/Admin/Settings/SettingsController.php

@@ -110,14 +110,13 @@ class SettingsController extends Controller
         }
     }
 
-//    参数设置
+//    参数设置  key =A  value=B sort=X  $score = logxS + A/T + B
     public function paihangEdit(Request $reqeust) {
         if ($reqeust->method() == 'POST') {
             $data = (array) request('data');
             $result = BaseSettingsModel::where('category','paihang')->get();
             if (count($result) == 0) {
                 $data['category'] = 'paihang';
-                $data['sort'] = 0;
                 $data['pid'] = 0;
                 $ok = BaseSettingsModel::create($data);
                 if ($ok) {

server/app/Http/Controllers/Admin/User/Cash/OutController.php

@@ -8,7 +8,9 @@
  */
 namespace App\Http\Controllers\Admin\User\Cash;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\AccountLog;
 use App\Models\SystemInfoModel;
+use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\User\Cash\Criteria\MultiWhere;
@@ -97,6 +99,24 @@ class OutController extends Controller
             if ($data['status'] == 3) {
                 $message = '你的提现被拒绝了。客服会在短时间内联系你。';
             }else{
+//                已打款  记录提现日志
+                $user = UserInfoModel::find($data['user_id']);
+                if (!empty($user)) {
+                    $arr = [
+                        'from_type'=>'梦想币',
+                        'from_id'=>$data['user_id'],
+                        'from_name'=>$user->nickname,
+                        'op'=>'提现',
+                        'from_amount'=>$data['cash'],
+                        'to_type'=>'现金',
+                        'to_id'=>$data['user_id'],
+                        'to_name'=>$user->nickname,
+                        'to_amount'=>$data['cash'],
+                        'channel'=>'平台内',
+                        'avatar'=>$user->avatar,
+                    ];
+                    AccountLog::create($arr);
+                }
                 $message = '你提现的¥'.$data['cash'].'已经到账啦，去实现梦想吧！喵～';
             }
             $arr = [

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

@@ -405,10 +405,12 @@ class DreamController extends Controller
         $user_care_dream = UserCareDream::where('user_id', $user->id)->where('dream_id', $dream_id)->first();
         $is_collection = empty($user_care_dream) ? 0 :1 ;
         $setting = BaseSettingsModel::where('category','score')->select('key','value')->first();
-        $a = count($setting) > 0 ? $setting->key : '';
+        $a = count($setting) > 0 ? $setting->key : 0;
         $b =  intval((time()-strtotime($dream->created_at))/60) ;
-        $c = count($setting) > 0 ? $setting->value : '';
-        //Todo 支持乘数目公式
+        $c = count($setting) > 0 ? $setting->value : 0;
+        $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);
         if ($number <= 1) $number = 1;
 
@@ -478,17 +480,6 @@ class DreamController extends Controller
             if (!$ok) {
                 return $this->error(ErrorCode::MERCHANT_SERVICE_STATUS_INVALID);
             }
-            //                记录充值记录     新增系统消息
-            $data = [
-                'from_id' =>$user->id,
-                'to_id' => $user_id,
-                'from_amount' => $coin,
-                'to_amount' => $coin,
-                'from_type' => AccountLog::TYPE_COIN,
-                'to_type' =>  AccountLog::TYPE_COIN,
-                'op' =>  AccountLog::OP_SUPPORT,
-            ];
-            AccountLog::create($data);
             $message = UserInfoModel::find($user->id)->nickname.'为你的梦想支持了'.$coin.'梦想币';
             $info = [
                 'to_user_id' => $user_id,
@@ -637,7 +628,7 @@ class DreamController extends Controller
             ];
             SystemInfoModel::firstOrCreate($info2);
             //            长连接
-            $this->jPush($message,'',$dream->user_id);
+//            $this->jPush($message,'',$dream->user_id);
         }else{
             UserCareDream::where('user_id',$user->id)->
             where('dream_id',$request->id)->delete();
@@ -645,6 +636,18 @@ class DreamController extends Controller
             SystemInfoModel::where('to_user_id',$dream->user_id)->where('dream_id',$request->id)->delete();
         }
 
+//        当有人收藏/取消收藏你的梦想时 梦想分发生变化
+        $setting = BaseSettingsModel::where('category','paihang')->first();
+        $a = $setting?$setting->key:1;
+        $b = $dream->parameter;
+        $x = $setting?$setting->sort:10;
+        $t = 21*24*60; //梦想发布分钟数
+        $care_num = UserCareDream::where('dream_id',$dream->id)->get()->count();
+        $score = (log($care_num,$x) + ($a/$t) + $b)*100000000000000 ;
+        $dream->score = $score;
+        $dream->save();
+
+
         //            并且同时会关注这个梦想者
         $array = [
             'user_id' =>$user->id,
@@ -781,21 +784,21 @@ class DreamController extends Controller
         );
         if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
         \Log::debug($user);
-        $data2 = $user->myCareNum;
-        $care_num = count($data2);
+        $care_num = 0;   //梦想收藏人数 新建梦想时默认为1
         $setting = BaseSettingsModel::where('category','paihang')->first();
         $a = $setting?$setting->key:1;
         $b = $setting?$setting->value:1;
-        $t = 21*3600 / 60;
+        $x = $setting?$setting->sort:10;
+        $t = 21*24*60; //梦想发布分钟数
         $days = $request->days;
         $data = $request->except('_token','pics','days');
         $data['user_id'] = $user->id;
         $data['end_time'] = date('Y-m-d H:i:s',strtotime('+'.$days.' days'));
         \Log::debug($data['end_time'].' care_num:'.$care_num.' a:'.$a.' b:'.$b.' t:'.$t);
         if ($care_num == 0) {
-            $data['score'] = (($a/$t) + $b)*100000000 ;
+            $data['score'] = (($a/$t) + $b)*100000000000000 ;
         }else{
-            $data['score'] = (log($care_num) + ($a/$t) + $b)*100000000 ;
+            $data['score'] = (log($care_num,$x) + ($a/$t) + $b)*100000000000000 ;
         }
         $data['created_at'] = date('Y-m-d H:i:s');
         $data['updated_at'] = date('Y-m-d H:i:s');

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

@@ -158,7 +158,6 @@ class PayController extends Controller
                 }
 
                 DB::beginTransaction();
-                $cType = AccountLog::TYPE_COIN;
                 $u->coin += $order->number;
                 if ($u->save()) {
 
@@ -169,7 +168,7 @@ class PayController extends Controller
                     //记日志
                     $this->logAccount(AccountLog::TYPE_CASH, $u->id, $u->name,$order->price,
                         AccountLog::OP_CHARGE,
-                        AccountLog::TYPE_COIN, $u->id,$u->name,$order->price,$order->transaction_id,$u->avatar);
+                        AccountLog::TYPE_COIN, $u->id,$u->name,$order->price,$out_trade_no,$u->avatar);
 
                     \Log::info('支付完成');
 

server/app/Models/AccountLog.php

@@ -21,7 +21,6 @@ class AccountLog extends Model
         'transaction_id',
         'avatar',
         'channel',
-        'avatar',
         'title',
         'dream_id',
         'note',

server/app/Models/UserInfoModel.php

@@ -139,4 +139,5 @@ class UserInfoModel extends Authenticatable
         return $this->hasMany('App\Models\UserBank','user_id','id');
     }
 
+
 }

server/database/migrations/2017_11_03_155229_alert_score_to_dream_info_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AlertScoreToDreamInfoTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('dream_info', function (Blueprint $table) {
+            $table->unsignedBigInteger('score')->defalut(0)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('dream_info', function (Blueprint $table) {
+            //
+        });
+    }
+}

server/resources/views/admin/dream/info/index.blade.php

@@ -62,14 +62,12 @@
             <td>{{ $item->name }}</td>
             <td>{{ $item->coin }}</td>
             <td>{{ $item->get_coin }}</td>
-			<td>{{ $item->mark }}</td>
+			<td>{{ $item->score }}</td>
 			<td>{{ $item->sign }}</td>
 			<td>
-				@if(!empty($ab_value))
-					A:{{ $ab_value->key }} <br>
-					B:{{ $ab_value->value }}<br>
-				@endif
-				C:{{ $item->parameter }}
+				X:{{ $item->x }} <br>
+				Y:{{ $item->y }}<br>
+				Z:{{ $item->parameter }}
 			</td>
 			<td>
 				<a onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('/Dream/Info/show_code',['code'=> $item->code])}}'});"  class="btn btn-primary ">查看</a>

server/resources/views/admin/settings/paihang/edit.blade.php

@@ -46,6 +46,15 @@
                                         <input id="value" name="data[value]" class="form-control" value="{{ $data['value'] or '0'}}" required="" aria-required="true"  placeholder="">
                                     </div>
 
+                                </div>
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">X</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="value" name="data[sort]" class="form-control" value="{{ $data['sort'] or '0'}}" required="" aria-required="true"  placeholder="">
+                                    </div>
+
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">&nbsp;</label>

server/resources/views/admin/settings/score/edit.blade.php

@@ -43,7 +43,16 @@
                                     <label class="control-label col-sm-3">B</label>
 
                                     <div class="col-sm-9">
-                                        <input id="value" name="data[value]" class="form-control" value="{{ $data['value'] or '8'}}" required="" aria-required="true"  placeholder="">
+                                        <input id="value" name="data[value]" class="form-control" value="{{ $data['value'] or ''}}" required="" aria-required="true"  placeholder="">
+                                    </div>
+
+                                </div>
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">N</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="" name="data[sort]" class="form-control" value="{{ $data['sort'] or ''}}" required="" aria-required="true"  placeholder="">
                                     </div>
 
                                 </div>

server/resources/views/admin/user/cash/out/index.blade.php

@@ -45,7 +45,7 @@
             <th class="sorting" data-sort="bank_id"> 银行卡姓名 </th>
             <th class="sorting" data-sort="status"> 提现状态</th>
             <th class="sorting" data-sort="cash"> 提现金额 </th>
-            <th class="sorting" data-sort="created_at"> 提现时间 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
         						<th width="22%">相关操作</th>
         					</tr>
 						</thead>