Merge remote-tracking branch 'origin/master'

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1365,8 +1365,8 @@ class OrderMerchantRepository extends BaseRepository
                 $annuity_once = Db::name("user")->where("uid", $uid)->value('annuity_once');
                 if ($annuity_once == 0 && $status == 1) {
                     $spreadUid = Db::name('user')->where('uid', $uid)->value('spread_uid');
-                    $userRepository = app()->make(UserRepository::class);
-                    $userRepository->sign_add($spreadUid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
+                    // $userRepository = app()->make(UserRepository::class);
+                    // $userRepository->sign_add($spreadUid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
                     Db::name("user")->where("uid", $uid)->update(['annuity_once' => 1]);
 
 //                    Db::name('user')->where('uid',$spreadUid)->inc('score', systemConfig('ylj_first_score'))->update();

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2364,7 +2364,7 @@ class StoreOrderRepository extends BaseRepository
         if ($annuity_once == 0) {
 
             $userRepository = app()->make(UserRepository::class);
-            $userRepository->sign_add($user->spread_uid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
+            // $userRepository->sign_add($user->spread_uid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
             Db::name("user")->where("uid", $user->uid)->update(['annuity_once' => 1]);
 
 //                Db::name('user')->where('uid',$user->spread_uid)->inc('score', systemConfig('ylj_first_score'))->update();
@@ -5208,7 +5208,7 @@ class StoreOrderRepository extends BaseRepository
 //                Db::name('user_sign_score')->insert($ins_data);
 
                 $userRepository = app()->make(UserRepository::class);
-                $userRepository->sign_add($user->spread_uid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
+                // $userRepository->sign_add($user->spread_uid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
                 Db::name("user")->where("uid", $user->uid)->update(['annuity_once' => 1]);
             }
 
@@ -5651,8 +5651,8 @@ class StoreOrderRepository extends BaseRepository
                 $annuity_once = Db::name("user")->where("uid", $order['uid'])->value('annuity_once');
                 if ($annuity_once == 0) {
                     $spreadUid = Db::name('user')->where('uid', $order['uid'])->value('spread_uid');
-                    $userRepository = app()->make(UserRepository::class);
-                    $userRepository->sign_add($spreadUid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
+                    // $userRepository = app()->make(UserRepository::class);
+                    // $userRepository->sign_add($spreadUid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
                     Db::name("user")->where("uid", $order['uid'])->update(['annuity_once' => 1]);
                 }
             }
@@ -6605,7 +6605,7 @@ class StoreOrderRepository extends BaseRepository
         $first_shopping = Db::name("user")->where("uid", $uid)->value("first_shopping");
         //0表示首次消费
         if ($first_shopping == 0) {
-            $userRepository->sign_add($uid, systemConfig('first_shopping'), 2, '首次消费赠送积分', '', '', $order_id, 1, 'store_order');
+            // $userRepository->sign_add($uid, systemConfig('first_shopping'), 2, '首次消费赠送积分', '', '', $order_id, 1, 'store_order');
             //赠送积分之后状态改为1
             Db::name("user")->where("uid", $uid)->update(["first_shopping" => 1]);
         }

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积分','','');
 
             Db::commit();
             return $user;
@@ -1523,13 +1523,13 @@ class UserRepository extends BaseRepository
         if ($spreadUid && !$user->spread_uid && $user->uid != $spreadUid) {
             Db::transaction(function () use ($spreadUid, $user) {
                 $spread_user = $this ->get($spreadUid);
-                //首次邀请赠送899积分
-                if($spread_user['spread_count'] == 0){
-                    //首次邀请好友奖励积分
-                    $this -> sign_add($spreadUid,systemConfig('first_yq_score'),1,'首次邀请好友奖励积分','','');
-                }
-                //邀请好友奖励积分
-                $this -> sign_add($spreadUid,systemConfig('invitation'),1,'邀请好友注册奖励积分','','');
+                // //首次邀请赠送899积分
+                // if($spread_user['spread_count'] == 0){
+                //     //首次邀请好友奖励积分
+                //     $this -> sign_add($spreadUid,systemConfig('first_yq_score'),1,'首次邀请好友奖励积分','','');
+                // }
+                // //邀请好友奖励积分
+                // $this -> sign_add($spreadUid,systemConfig('invitation'),1,'邀请好友注册奖励积分','','');
                 $user->spread_uid = $spreadUid;
                 $user->spread_time = date('Y-m-d H:i:s');
                 if($spreadUid){

app/common/repositories/user/UserThirdRepository.php

@@ -162,8 +162,8 @@ class UserThirdRepository extends BaseRepository
 //                $ins_data['mark'] = '好友首次获得已结算养老金奖励积分';
 //                Db::name('user_sign_score')->insert($ins_data);
 
-                    $userRepository = app()->make(UserRepository::class);
-                    $userRepository -> sign_add($spreadUid,systemConfig('ylj_first_score'),1,'好友首次获得已结算养老金奖励积分','','','');
+                    // $userRepository = app()->make(UserRepository::class);
+                    // $userRepository -> sign_add($spreadUid,systemConfig('ylj_first_score'),1,'好友首次获得已结算养老金奖励积分','','','');
                     Db::name("user")->where("uid",$v['uid'])->update(['annuity_once'=>1]);
                 }
 

app/controller/api/newhome/Newhome.php

@@ -83,19 +83,27 @@ class Newhome extends BaseController
                 return app('json')->fail('今日已签到');
             }
         }
+
+        //第一天签到获得2积分,第二天获得4积分,第三天获得6积分,第四天获得 10 积分,第五天获得 14积分第六天获得 20积分,
+        //连续签到从第七天开始,每日签到获得3积分,第七天连续签到额外奖励 38积分,第 14 天连续签到额外奖励 68 积分,第 21天连续签到额外奖励 128 积分第 30 天连续签到额外奖励 188 积分
+        $guizeList = ['1'=>2,'2'=>4,'3'=>6,'4'=>10,'5'=>14,'6'=>20];
+        $guizeLxList = [['sizi'=>7, 'value'=> 38], ['sizi'=>14, 'value'=> 68], ['sizi'=>21, 'value'=> 38], ['sizi'=>30, 'value'=> 188]];//连续签到额外奖励
+
         if(!$signdata){
             $pension=$this->one_sign($uid);
-        }elseif($signdata['num']>=1&&$signdata['num']<8){
+        }elseif($signdata['num']>=1&&$signdata['num']<7){
+
             $res=$this->lianxu_sign($signdata['day'],$uid);
             if($res==0){
                 $this->one_sign($uid);
             }else {
                 $pension = rand('1', '50');
                 $pension=$pension*0.01;
-                Db::name('sign')->insert(['uid' => $uid, 'year' => $year, 'month' => $month, 'day' => $day,'num' => $signdata['num'] + 1, 'pension' => $pension, 'status' => 1]);
+                $score = $guizeList[$signdata['num']]??3;
+                $this->sign_add($uid, $score,1,'签到赠送积分','','');
+                Db::name('sign')->insert(['uid' => $uid, 'year' => $year, 'month' => $month, 'day' => $day,'num' => $signdata['num'] + 1, 'score' => $score, 'pension' => $pension, 'status' => 1]);
             }
-
-        }elseif($signdata['num']==8){
+        }elseif($signdata['num'] >= 7){
             $res=$this->lianxu_sign($signdata['day'],$uid);
             if($res==0){
                 Db::name('sign')->where('uid',$uid)->update(['status'=>3]);
@@ -103,9 +111,19 @@ class Newhome extends BaseController
             }else {
                 $pension = rand('10', '100');
                 $pension=$pension*0.01;
-                Db::name('sign')->insert(['uid' => $uid, 'year' => $year, 'month' => $month, 'day' => $day, 'num' => $signdata['num'] + 1, 'pension' => $pension, 'status' => 1]);
+                $score = $guizeList[$signdata['num']]??3;
+                $this->sign_add($uid, $score,1,'签到赠送积分','','');
+                $scoreGw = 0;
+                foreach ($guizeLxList as $val) {
+                    if ($signdata['num'] >= $val['sizi']) {
+                        $scoreGw = $val['value'];
+                    }
+                }
+                if($scoreGw > 0){
+                    $this->sign_add($uid, $score,1,'连续签到赠送额外奖励积分','','');
+                }
+                Db::name('sign')->insert(['uid' => $uid, 'year' => $year, 'month' => $month, 'day' => $day, 'num' => $signdata['num'] + 1, 'score' => $score, 'pension' => $pension, 'status' => 1]);
             }
-
         }else{
             $pension='0.00';
         }
@@ -121,8 +139,60 @@ class Newhome extends BaseController
         $pension=['0.5','0.6','1'];
         $pensions=array_rand($pension);
         Db::name('sign')->insert(['uid'=>$uid,'year'=>$year,'month'=>$month,'day'=>$day,'num'=>1,'pension'=>$pension[$pensions],'status'=>1]);
+
+        //首次签到送30积分，同时赠送邀请人30积分
+        $this->sign_add($uid, 30,1,'首次签到送30积分','','');
+        $member_info = Db::name('user')->where( array('uid' => $uid) )->find();
+        if($member_info['spread_uid']){
+            $spreadUid = $member_info['spread_uid'];
+            $this->sign_add($spreadUid, 30,1,'邀请人首次签到送30积分','','');
+        }
+
         return $pension[$pensions];
     }
+
+    /**
+     * @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();
+        }
+    }
+
+
     //签到是否正常
     public function lianxu_sign($day,$uid)
     {

app/controller/api/user/User.php

@@ -733,13 +733,13 @@ class User extends BaseController
             $params['status'] = 1;
             $res = $this->repository->add_cer($params, $member_id);
             if ($res) {
-                //赠送积分 完善实名送20个积分，同时送邀请人20个积
-                $this->sign_add($member_id, 20,1,'完善实名系统赠送20个积分','','');
+                //赠送积分 完善实名送90个积分，同时送邀请人50个积分
+                $this->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','');
                 $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, 20,1,'好友完善实名系统赠送20个积分','','');
+                    $this->sign_add($spreadUid, 50,1,'好友完善实名系统赠送50个积分','','');
                 }
                 return app('json')->success($res);
             } else {