积分相关

app/common/repositories/user/UserRepository.php

@@ -963,7 +963,7 @@ class UserRepository extends BaseRepository
 //            Queue::push(SendNewPeopleCouponJob::class, $user->uid);
 
             //赠送积分 注册送10积分
-            // $this->sign_add($user['uid'], 10,1,'注册送10积分','','');
+            $this->sign_add($user['uid'], 10,1,'注册送10积分','','', '', 1, '', 1);
 
             Db::commit();
             return $user;

app/controller/api/user/User.php

@@ -737,13 +737,14 @@ class User extends BaseController
             $params['status'] = 1;
             $res = $this->repository->add_cer($params, $member_id);
             if ($res) {
+                $userRepository = app()->make(UserRepository::class);
                 //赠送积分 完善实名送90个积分，同时送邀请人50个积分
-                $this->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','');
+                $userRepository->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','', '', 1, '', 1);
                 $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
                 if($member_info['spread_uid']){
                     //好友完善实名系统赠送50个积分
                     $spreadUid = $member_info['spread_uid'];
-                    $this->sign_add($spreadUid, 50,1,'好友完善实名系统赠送50个积分','','');
+                    $userRepository->sign_add($spreadUid, 50,1,'好友完善实名系统赠送50个积分','','', '', 1, '', 1);
                 }
                 return app('json')->success($res);
             } else {
@@ -757,47 +758,6 @@ class User extends BaseController
 
 
     /**
-     * @param int $uid 用户ID
-     * @param string $score 积分
-     * @param int $status 积分状态
-     * @param string $mark 备注
-     * @param string $has_qian 连续签到天数
-     * @param string $today_signintime 签到时间
-     * @param int $order_id 订单ID
-     * @param int $pm 1-收入。2-支出
-     * @param string $order_type
-     * @throws DbException
-     */
-    public function sign_add($uid, $score, $status, $mark, $has_qian = '', $today_signintime = '', $order_id = 0, $pm = 1, $order_type = '',$type='',$settlement_time = '')
-    {
-        if(!in_array($type,[1,2])){
-            // 其他情况都直接返回，因为目前只有365专区购买才可以获得
-            return false;
-        }
-
-        $ins_data['uid'] = $uid;
-        $ins_data['continuity_day'] = $has_qian;
-        $ins_data['reward_socre'] = $score;
-        $ins_data['signin_time'] = $today_signintime;
-        $ins_data['addtime'] = time();
-        $ins_data['status'] = $status;
-        $ins_data['mark'] = $mark;
-        $ins_data['type'] = $type;
-        $ins_data['settlement_time'] = $settlement_time;// 结算时间 真正到了结算时间会结算
-        $ins_data['order_id'] = $order_id;
-        $ins_data['pm'] = $pm;
-        $ins_data['order_type'] = $order_type;
-        Db::name('user_sign_score')->insertGetId($ins_data);
-
-        if($pm == 1 && $status == 1){
-            Db::name('user')->where('uid',$uid)->inc('score', $score)->update();
-        }
-        if($pm == 2){
-            Db::name('user')->where('uid', $uid)->dec('score', $score)->update();
-        }
-    }
-
-    /**
      * 申请代理
      * name:公司名称
      * identity：身份
@@ -2621,6 +2581,9 @@ class User extends BaseController
         $uid = $this->request->uid();//签到用户
         $user = Db::name('user')->where('uid', $uid)->field("spread_uid,first_sign")->find();//上级用户
 
+        //第一天签到获得2积分,第二天获得4积分,第三天获得6积分,第四天获得 10 积分,第五天获得 14积分第六天获得 20积分,
+        //连续签到从第七天开始,每日签到获得3积分,第七天连续签到额外奖励 38积分,第 14 天连续签到额外奖励 68 积分,第 21天连续签到额外奖励 128 积分第 30 天连续签到额外奖励 188 积分
+
         //前6天积分
         $score = [
             2,//1
@@ -2653,39 +2616,52 @@ class User extends BaseController
                 $has_qian = $yes_signin_info['continuity_day'] + 1;
                 $has_qian = $has_qian > 30 ? 1 : $has_qian;
             }
+            $get_score = 0;
+            $get_gw_score = 0;
             if ($has_qian <= 6) {
                 $get_score = $score[$has_qian - 1];
             } else {
                 $get_score = $scoreS;
                 if (isset($scoreExtra[$has_qian])) {
-                    $get_score = $scoreS + $scoreExtra[$has_qian];
+                    $get_gw_score = $scoreExtra[$has_qian];
                 }
             }
 
             $userRepository = app()->make(UserRepository::class);
-            $userRepository->sign_add($uid, $get_score, 1, '签到赠送积分', $has_qian, $today_signintime, '');
+            $userRepository->sign_add($uid, $get_score, 1, '签到赠送积分', $has_qian, $today_signintime, '', 1, '', 1);
+            if($get_gw_score > 0){
+                $userRepository->sign_add($uid, $get_gw_score,1,'连续签到赠送额外奖励积分', $has_qian, $today_signintime, '', 1, '', 1);
+            }   
+
 
             //首次签到
             if ($user['first_sign'] == 0) {
+                //首次签到送30积分，同时赠送邀请人30积分
+                $userRepository->sign_add($uid, 30,1,'首次签到送30积分','','', '', 1, '', 1);
+                $member_info = Db::name('user')->where( array('uid' => $uid) )->find();
+                if($member_info['spread_uid']){
+                    $spreadUid = $member_info['spread_uid'];
+                    $userRepository->sign_add($spreadUid, 30,1,'邀请人首次签到送30积分','','', '', 1, '', 1);
+                }
                 Db::name('user')->where('uid', $uid)->update(['first_sign' => 1]);
             } elseif ($user['first_sign'] == 1 && $has_qian == 1) {
                 Db::name('user')->where('uid', $uid)->update(['first_sign' => 2]);
             }
 
-            //非首次签到，第一天，断签
-            //好友连续签到3天 奖励50
-            //好友连续签到14天 奖励100
-            //好友联系签到30天 奖励300
-            if ($user['first_sign'] < 2) {
-                if ($has_qian == 3) {
-                    $userRepository->sign_add($user['spread_uid'], 50, 1, '好友签到赠送积分', '', $today_signintime, '');
-                } elseif ($has_qian == 14) {
-                    $userRepository->sign_add($user['spread_uid'], 100, 1, '好友签到赠送积分', '', $today_signintime, '');
-                } elseif ($has_qian == 30) {
-                    $userRepository->sign_add($user['spread_uid'], 300, 1, '好友签到赠送积分', '', $today_signintime, '');
-                    Db::name('user')->where('uid', $uid)->update(['first_sign' => 3]);
-                }
-            }
+            // //非首次签到，第一天，断签
+            // //好友连续签到3天 奖励50
+            // //好友连续签到14天 奖励100
+            // //好友联系签到30天 奖励300
+            // if ($user['first_sign'] < 2) {
+            //     if ($has_qian == 3) {
+            //         $userRepository->sign_add($user['spread_uid'], 50, 1, '好友签到赠送积分', '', $today_signintime, '');
+            //     } elseif ($has_qian == 14) {
+            //         $userRepository->sign_add($user['spread_uid'], 100, 1, '好友签到赠送积分', '', $today_signintime, '');
+            //     } elseif ($has_qian == 30) {
+            //         $userRepository->sign_add($user['spread_uid'], 300, 1, '好友签到赠送积分', '', $today_signintime, '');
+            //         Db::name('user')->where('uid', $uid)->update(['first_sign' => 3]);
+            //     }
+            // }
 
             return app('json')->success('签到成功', ['score' => $get_score]);
         }