15954078560 3 年 前
コミット
93daf9d519

+ 7 - 2
application/api/controller/Index.php

@@ -304,8 +304,13 @@ class Index extends Api
      */
     public function getInviteusers() {
         $user_list = \app\common\model\User::field('id,nickname,invite_time')->where(['pre_user_id'=>$this->auth->id])->select();
-        if($user_list) foreach($user_list as $k => $v) {
-            $user_list[$k]['invite_time'] = date('Y-m-d H:i:s',$v['invite_time']);
+        if($user_list) {
+            $user_profit_log = Db::name('user_profit_log');
+            foreach($user_list as $k => &$v) {
+                $user_list[$k]['invite_time'] = date('Y-m-d H:i:s',$v['invite_time']);
+                $income = $user_profit_log->where(['user_id' => $v['id']])->order('id', 'desc')->value('after');
+                $v['total_income'] = $income ? : "0.00";
+            }
         }
         $this->success("获取成功!",$user_list);
     }

+ 11 - 1
application/api/controller/User.php

@@ -853,11 +853,21 @@ class User extends Api
                 }
                 if($profit >= 0.01 && $fate_user_id > 0) {
                     $res3 = \app\common\model\User::profit($profit,$fate_user_id,$memo);
+                    //给上级返利
+                    $fate_user_info = \app\common\model\User::where(['id'=>$fate_user_id])->find();
+                    $profit_last = $profit * config('site.SuperioruserProfitRate') * 0.01;
+                    if($profit_last >= 0.01 && $fate_user_info['pre_user_id'] > 0) {
+                        $res4 = \app\common\model\User::profit($profit_last,$fate_user_info['pre_user_id'],$fate_user_info['nickname'].'被查看有眼缘获得收益');
+                    } else {
+                        $res4 = true;
+                    }
+
                 } else {
                     $res3 = true;
+                    $res4 = true;
                 }
 
-                if($res1 && $res2 && $res3) {
+                if($res1 && $res2 && $res3 && $res4) {
                     Db::commit();
 
                     $fate_user_info = \app\common\model\User::where(['id'=>$fate_user_id])->find();

ファイルの差分が大きいため隠しています
+ 3 - 3
application/extra/site.php


+ 10 - 0
application/index/controller/Index.php

@@ -25,4 +25,14 @@ class Index extends Frontend
         return $this->view->fetch();
     }
 
+    //邀请页面
+    public function invite() {
+        $code = input('code', '', 'trim');
+
+
+        $this->view->assign('code', $code);
+
+        return $this->view->fetch();
+    }
+
 }

+ 23 - 0
application/index/view/index/invite.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+
+    <head>
+
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="description" content="">
+        <meta name="author" content="">
+
+        <title>{$site.name}</title>
+
+    </head>
+
+    <body id="page-top">
+            {$info}
+        <script src="__CDN__/assets/libs/jquery/dist/jquery.min.js"></script>
+
+        <script src="__CDN__/assets/libs/bootstrap/dist/js/bootstrap.min.js"></script>
+    </body>
+
+</html>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません