Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -589,7 +589,7 @@ class Auth extends BaseController
         //给推荐人下级+1
         Db::name('user')->where('uid', $spreadUid)->update(['spread_count' => Db::raw('spread_count + 1')]);
 
-        $this->sign_add($spreadUid, 30,1,'邀请好友注册奖励积分','','', '', 1, '', 1);
+        $this->sign_add($spreadUid, 30,1,'邀请好友注册奖励积分','','', '', 1, '', 2);
 
         Cache::zincrby('s_top_' . date('Y-m'), 1, $spreadUid);
         Cache::zincrby('s_top_' . monday(), 1, $spreadUid);
@@ -1978,7 +1978,7 @@ class Auth extends BaseController
         $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;