Merge remote-tracking branch 'origin/dev' into dev

app/common/repositories/user/UserRepository.php

@@ -1093,6 +1093,7 @@ class UserRepository extends BaseRepository
                     if($award_type == 1){
                         // 增加
                         $isert_data['pm'] = 1;
+                        $isert_data['gzc'] = 1;
                         Db::name('user')->where('uid',$user['uid'])->inc('annuity', $num)->update();
                     }else{
                         // 减少
@@ -1102,6 +1103,29 @@ class UserRepository extends BaseRepository
                 }
                 Db::name('user_bill')->insert($isert_data);
             }
+
+            if ($commission_type == 5 && $award_type == 1) {
+                $cer = Db::name('user')
+                    ->where('uid', $user['uid'])
+                    ->field('real_name, phone, card_id')
+                    ->find();
+                $ylj_data_log = [
+                    'user_name' => $cer['real_name'],
+                    "mobile" => $cer['phone'],
+                    "user_card" => $cer['card_id'],//身份证
+                    "pension" => $num,//养老金
+                    "out_trade_no" => '',
+                    "account_type" => '',
+                    "order_type" => 0,
+                    "pay_time" => '',
+                    "create_time" => date('Y-m-d H:i:s'),
+                    "update_time" => date('Y-m-d H:i:s'),
+                    "uid" => $user['uid'],
+                    "platform_no" => 'IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999),
+                    "link_id" => ''
+                ];
+                Db::name('gzc_logs')->insert($ylj_data_log);
+            }
             $insert_data = [
                 'uid' => $user['uid'],
                 'type' => $type,