赠送积分调整

app/common/repositories/user/UserRepository.php

@@ -3095,15 +3095,17 @@ class UserRepository extends BaseRepository
         $ins_data['uid'] = $uid;
         $ins_data['continuity_day'] = $has_qian;
         $ins_data['reward_socre'] = $score;
+        $ins_data['source_uid'] = $uid;
         $ins_data['signin_time'] = $today_signintime;
         $ins_data['addtime'] = time();
         $ins_data['status'] = $status;
         $ins_data['mark'] = $mark;
-        $ins_data['type'] = $type;
+        $ins_data['source_type'] = $type;
         $ins_data['settlement_time'] = $settlement_time;// 结算时间 真正到了结算时间会结算
         $ins_data['order_id'] = $order_id;
         $ins_data['pm'] = $pm;
         $ins_data['order_type'] = $order_type;
+        $ins_data['surplus'] = 0;
         Db::name('user_sign_score')->insertGetId($ins_data);
 
         if($pm == 1 && $status == 1){

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：身份
@@ -2668,20 +2628,20 @@ class User extends BaseController
             }
 
             $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, '');
-            }
+                $userRepository->sign_add($uid, $get_gw_score,1,'连续签到赠送额外奖励积分', $has_qian, $today_signintime, '', 1, '', 1);
+            }   
 
 
             //首次签到
             if ($user['first_sign'] == 0) {
                 //首次签到送30积分，同时赠送邀请人30积分
-                $this->sign_add($uid, 30,1,'首次签到送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'];
-                    $this->sign_add($spreadUid, 30,1,'邀请人首次签到送30积分','','');
+                    $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) {