Explorar o código

积分签到调整

xialei hai 1 ano
pai
achega
ba9ba76f84

+ 2 - 2
app/common/repositories/merchant/order/OrderMerchantRepository.php

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

+ 5 - 5
app/common/repositories/store/order/StoreOrderRepository.php

@@ -2364,7 +2364,7 @@ class StoreOrderRepository extends BaseRepository
2364 2364
         if ($annuity_once == 0) {
2365 2365
 
2366 2366
             $userRepository = app()->make(UserRepository::class);
2367
-            $userRepository->sign_add($user->spread_uid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
2367
+            // $userRepository->sign_add($user->spread_uid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
2368 2368
             Db::name("user")->where("uid", $user->uid)->update(['annuity_once' => 1]);
2369 2369
 
2370 2370
 //                Db::name('user')->where('uid',$user->spread_uid)->inc('score', systemConfig('ylj_first_score'))->update();
@@ -5208,7 +5208,7 @@ class StoreOrderRepository extends BaseRepository
5208 5208
 //                Db::name('user_sign_score')->insert($ins_data);
5209 5209
 
5210 5210
                 $userRepository = app()->make(UserRepository::class);
5211
-                $userRepository->sign_add($user->spread_uid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
5211
+                // $userRepository->sign_add($user->spread_uid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
5212 5212
                 Db::name("user")->where("uid", $user->uid)->update(['annuity_once' => 1]);
5213 5213
             }
5214 5214
 
@@ -5651,8 +5651,8 @@ class StoreOrderRepository extends BaseRepository
5651 5651
                 $annuity_once = Db::name("user")->where("uid", $order['uid'])->value('annuity_once');
5652 5652
                 if ($annuity_once == 0) {
5653 5653
                     $spreadUid = Db::name('user')->where('uid', $order['uid'])->value('spread_uid');
5654
-                    $userRepository = app()->make(UserRepository::class);
5655
-                    $userRepository->sign_add($spreadUid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
5654
+                    // $userRepository = app()->make(UserRepository::class);
5655
+                    // $userRepository->sign_add($spreadUid, systemConfig('ylj_first_score'), 1, '好友首次获得已结算养老金奖励积分', '', '', '');
5656 5656
                     Db::name("user")->where("uid", $order['uid'])->update(['annuity_once' => 1]);
5657 5657
                 }
5658 5658
             }
@@ -6605,7 +6605,7 @@ class StoreOrderRepository extends BaseRepository
6605 6605
         $first_shopping = Db::name("user")->where("uid", $uid)->value("first_shopping");
6606 6606
         //0表示首次消费
6607 6607
         if ($first_shopping == 0) {
6608
-            $userRepository->sign_add($uid, systemConfig('first_shopping'), 2, '首次消费赠送积分', '', '', $order_id, 1, 'store_order');
6608
+            // $userRepository->sign_add($uid, systemConfig('first_shopping'), 2, '首次消费赠送积分', '', '', $order_id, 1, 'store_order');
6609 6609
             //赠送积分之后状态改为1
6610 6610
             Db::name("user")->where("uid", $uid)->update(["first_shopping" => 1]);
6611 6611
         }

+ 8 - 8
app/common/repositories/user/UserRepository.php

@@ -963,7 +963,7 @@ class UserRepository extends BaseRepository
963 963
 //            Queue::push(SendNewPeopleCouponJob::class, $user->uid);
964 964
 
965 965
             //赠送积分 注册送10积分
966
-            $this->sign_add($user['uid'], 10,1,'注册送10积分','','');
966
+            // $this->sign_add($user['uid'], 10,1,'注册送10积分','','');
967 967
 
968 968
             Db::commit();
969 969
             return $user;
@@ -1523,13 +1523,13 @@ class UserRepository extends BaseRepository
1523 1523
         if ($spreadUid && !$user->spread_uid && $user->uid != $spreadUid) {
1524 1524
             Db::transaction(function () use ($spreadUid, $user) {
1525 1525
                 $spread_user = $this ->get($spreadUid);
1526
-                //首次邀请赠送899积分
1527
-                if($spread_user['spread_count'] == 0){
1528
-                    //首次邀请好友奖励积分
1529
-                    $this -> sign_add($spreadUid,systemConfig('first_yq_score'),1,'首次邀请好友奖励积分','','');
1530
-                }
1531
-                //邀请好友奖励积分
1532
-                $this -> sign_add($spreadUid,systemConfig('invitation'),1,'邀请好友注册奖励积分','','');
1526
+                // //首次邀请赠送899积分
1527
+                // if($spread_user['spread_count'] == 0){
1528
+                //     //首次邀请好友奖励积分
1529
+                //     $this -> sign_add($spreadUid,systemConfig('first_yq_score'),1,'首次邀请好友奖励积分','','');
1530
+                // }
1531
+                // //邀请好友奖励积分
1532
+                // $this -> sign_add($spreadUid,systemConfig('invitation'),1,'邀请好友注册奖励积分','','');
1533 1533
                 $user->spread_uid = $spreadUid;
1534 1534
                 $user->spread_time = date('Y-m-d H:i:s');
1535 1535
                 if($spreadUid){

+ 2 - 2
app/common/repositories/user/UserThirdRepository.php

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

+ 76 - 6
app/controller/api/newhome/Newhome.php

@@ -83,19 +83,27 @@ class Newhome extends BaseController
83 83
                 return app('json')->fail('今日已签到');
84 84
             }
85 85
         }
86
+
87
+        //第一天签到获得2积分,第二天获得4积分,第三天获得6积分,第四天获得 10 积分,第五天获得 14积分第六天获得 20积分,
88
+        //连续签到从第七天开始,每日签到获得3积分,第七天连续签到额外奖励 38积分,第 14 天连续签到额外奖励 68 积分,第 21天连续签到额外奖励 128 积分第 30 天连续签到额外奖励 188 积分
89
+        $guizeList = ['1'=>2,'2'=>4,'3'=>6,'4'=>10,'5'=>14,'6'=>20];
90
+        $guizeLxList = [['sizi'=>7, 'value'=> 38], ['sizi'=>14, 'value'=> 68], ['sizi'=>21, 'value'=> 38], ['sizi'=>30, 'value'=> 188]];//连续签到额外奖励
91
+
86 92
         if(!$signdata){
87 93
             $pension=$this->one_sign($uid);
88
-        }elseif($signdata['num']>=1&&$signdata['num']<8){
94
+        }elseif($signdata['num']>=1&&$signdata['num']<7){
95
+
89 96
             $res=$this->lianxu_sign($signdata['day'],$uid);
90 97
             if($res==0){
91 98
                 $this->one_sign($uid);
92 99
             }else {
93 100
                 $pension = rand('1', '50');
94 101
                 $pension=$pension*0.01;
95
-                Db::name('sign')->insert(['uid' => $uid, 'year' => $year, 'month' => $month, 'day' => $day,'num' => $signdata['num'] + 1, 'pension' => $pension, 'status' => 1]);
102
+                $score = $guizeList[$signdata['num']]??3;
103
+                $this->sign_add($uid, $score,1,'签到赠送积分','','');
104
+                Db::name('sign')->insert(['uid' => $uid, 'year' => $year, 'month' => $month, 'day' => $day,'num' => $signdata['num'] + 1, 'score' => $score, 'pension' => $pension, 'status' => 1]);
96 105
             }
97
-
98
-        }elseif($signdata['num']==8){
106
+        }elseif($signdata['num'] >= 7){
99 107
             $res=$this->lianxu_sign($signdata['day'],$uid);
100 108
             if($res==0){
101 109
                 Db::name('sign')->where('uid',$uid)->update(['status'=>3]);
@@ -103,9 +111,19 @@ class Newhome extends BaseController
103 111
             }else {
104 112
                 $pension = rand('10', '100');
105 113
                 $pension=$pension*0.01;
106
-                Db::name('sign')->insert(['uid' => $uid, 'year' => $year, 'month' => $month, 'day' => $day, 'num' => $signdata['num'] + 1, 'pension' => $pension, 'status' => 1]);
114
+                $score = $guizeList[$signdata['num']]??3;
115
+                $this->sign_add($uid, $score,1,'签到赠送积分','','');
116
+                $scoreGw = 0;
117
+                foreach ($guizeLxList as $val) {
118
+                    if ($signdata['num'] >= $val['sizi']) {
119
+                        $scoreGw = $val['value'];
120
+                    }
121
+                }
122
+                if($scoreGw > 0){
123
+                    $this->sign_add($uid, $score,1,'连续签到赠送额外奖励积分','','');
124
+                }
125
+                Db::name('sign')->insert(['uid' => $uid, 'year' => $year, 'month' => $month, 'day' => $day, 'num' => $signdata['num'] + 1, 'score' => $score, 'pension' => $pension, 'status' => 1]);
107 126
             }
108
-
109 127
         }else{
110 128
             $pension='0.00';
111 129
         }
@@ -121,8 +139,60 @@ class Newhome extends BaseController
121 139
         $pension=['0.5','0.6','1'];
122 140
         $pensions=array_rand($pension);
123 141
         Db::name('sign')->insert(['uid'=>$uid,'year'=>$year,'month'=>$month,'day'=>$day,'num'=>1,'pension'=>$pension[$pensions],'status'=>1]);
142
+
143
+        //首次签到送30积分,同时赠送邀请人30积分
144
+        $this->sign_add($uid, 30,1,'首次签到送30积分','','');
145
+        $member_info = Db::name('user')->where( array('uid' => $uid) )->find();
146
+        if($member_info['spread_uid']){
147
+            $spreadUid = $member_info['spread_uid'];
148
+            $this->sign_add($spreadUid, 30,1,'邀请人首次签到送30积分','','');
149
+        }
150
+
124 151
         return $pension[$pensions];
125 152
     }
153
+
154
+    /**
155
+     * @param int $uid 用户ID
156
+     * @param string $score 积分
157
+     * @param int $status 积分状态
158
+     * @param string $mark 备注
159
+     * @param string $has_qian 连续签到天数
160
+     * @param string $today_signintime 签到时间
161
+     * @param int $order_id 订单ID
162
+     * @param int $pm 1-收入。2-支出
163
+     * @param string $order_type
164
+     * @throws DbException
165
+     */
166
+    public function sign_add($uid, $score, $status, $mark, $has_qian = '', $today_signintime = '', $order_id = 0, $pm = 1, $order_type = '',$type='',$settlement_time = '')
167
+    {
168
+        if(!in_array($type,[1,2])){
169
+            // 其他情况都直接返回,因为目前只有365专区购买才可以获得
170
+            return false;
171
+        }
172
+
173
+        $ins_data['uid'] = $uid;
174
+        $ins_data['continuity_day'] = $has_qian;
175
+        $ins_data['reward_socre'] = $score;
176
+        $ins_data['signin_time'] = $today_signintime;
177
+        $ins_data['addtime'] = time();
178
+        $ins_data['status'] = $status;
179
+        $ins_data['mark'] = $mark;
180
+        $ins_data['type'] = $type;
181
+        $ins_data['settlement_time'] = $settlement_time;// 结算时间 真正到了结算时间会结算
182
+        $ins_data['order_id'] = $order_id;
183
+        $ins_data['pm'] = $pm;
184
+        $ins_data['order_type'] = $order_type;
185
+        Db::name('user_sign_score')->insertGetId($ins_data);
186
+
187
+        if($pm == 1 && $status == 1){
188
+            Db::name('user')->where('uid',$uid)->inc('score', $score)->update();
189
+        }
190
+        if($pm == 2){
191
+            Db::name('user')->where('uid', $uid)->dec('score', $score)->update();
192
+        }
193
+    }
194
+
195
+
126 196
     //签到是否正常
127 197
     public function lianxu_sign($day,$uid)
128 198
     {

+ 4 - 4
app/controller/api/user/User.php

@@ -733,13 +733,13 @@ class User extends BaseController
733 733
             $params['status'] = 1;
734 734
             $res = $this->repository->add_cer($params, $member_id);
735 735
             if ($res) {
736
-                //赠送积分 完善实名送20个积分,同时送邀请人20个积
737
-                $this->sign_add($member_id, 20,1,'完善实名系统赠送20个积分','','');
736
+                //赠送积分 完善实名送90个积分,同时送邀请人50个积分
737
+                $this->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','');
738 738
                 $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
739 739
                 if($member_info['spread_uid']){
740
-                    //首次邀请好友奖励积分
740
+                    //好友完善实名系统赠送50个积分
741 741
                     $spreadUid = $member_info['spread_uid'];
742
-                    $this->sign_add($spreadUid, 20,1,'好友完善实名系统赠送20个积分','','');
742
+                    $this->sign_add($spreadUid, 50,1,'好友完善实名系统赠送50个积分','','');
743 743
                 }
744 744
                 return app('json')->success($res);
745 745
             } else {