diff --git a/app/admin/controller/CouponReceive.php b/app/admin/controller/CouponReceive.php index a671dd4..66c948b 100755 --- a/app/admin/controller/CouponReceive.php +++ b/app/admin/controller/CouponReceive.php @@ -28,7 +28,6 @@ class CouponReceive extends Base $whe[] = ['title', 'like', '%' . $keyword . '%']; } if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if (!empty($status)) { diff --git a/app/admin/controller/Finance.php b/app/admin/controller/Finance.php index cda3e77..9055e4f 100755 --- a/app/admin/controller/Finance.php +++ b/app/admin/controller/Finance.php @@ -29,7 +29,6 @@ class Finance extends Base $whe[] = ['order_type', '<', 12]; $whe[] = ['status', '=', 1]; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -83,7 +82,6 @@ class Finance extends Base $addtime = trim(input('get.addtime')); $whe = []; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -129,7 +127,6 @@ class Finance extends Base $addtime = trim(input('get.addtime')); $whe = []; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -173,7 +170,6 @@ class Finance extends Base $addtime = trim(input('get.addtime')); $whe = []; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -218,7 +214,6 @@ class Finance extends Base $type = trim(input('get.type')); $whe = []; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -275,7 +270,6 @@ class Finance extends Base $whe = []; // $whe[] = ['status', '=', 2]; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index 1e5f024..d1a6e8c 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -38,7 +38,6 @@ class Order extends Base $whe[] = ['status', '=', 0]; $whe[] = ['kd_is', '=', 1]; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -86,7 +85,6 @@ class Order extends Base $whe[] = ['status', '=', 1]; $whe[] = ['kd_is', '=', 0]; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -174,7 +172,6 @@ class Order extends Base $whe = array(); if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -258,7 +255,6 @@ class Order extends Base $whe[] = ['status', '>', 0]; } if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; $whe1[] = ['user_id', '=', $user_id]; } @@ -549,7 +545,6 @@ class Order extends Base $whe = [['status', '=', 1], ['kd_is', '=', 0]]; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -642,7 +637,6 @@ class Order extends Base $whe = []; if ($user_id) { - $user_id = $user_id - 1260; $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { @@ -735,7 +729,7 @@ class Order extends Base $whe = [['status', '=', $status]]; } if ($user_id) { - $whe[] = ['user_id', '=', $user_id - 1260]; + $whe[] = ['user_id', '=', $user_id]; } if ($mobile) { $mobile = User::where('mobile', $mobile)->value('id'); diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index af7ff5a..6bfb5d1 100755 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -40,7 +40,7 @@ class User extends Base // 构建查询条件 $where = []; if (!empty($param['user_id'])) { - $where[] = ['id', '=', intval($param['user_id']) - 1260]; + $where[] = ['id', '=', intval($param['user_id'])]; } if (!empty($param['mobile'])) { $where[] = ['mobile', 'like', "%{$param['mobile']}%"]; @@ -56,7 +56,7 @@ class User extends Base $where[] = ['addtime', 'between', [strtotime($times[0]), strtotime($times[1])]]; } if (!empty($param['pid'])) { - $where[] = ['pid', '=', intval($param['pid']) - 1260]; + $where[] = ['pid', '=', intval($param['pid'])]; } $field = '*'; $order = 'id desc'; @@ -489,7 +489,7 @@ class User extends Base $addtime = trim(input('get.addtime')); $uid = trim(input('get.uid')); if (!empty($uid)) { - $uid = $uid - 1260; + $uid = $uid ; $whe[] = ['id', '=', $uid]; } if (!empty($addtime)) { @@ -734,7 +734,7 @@ class User extends Base $whe1[] = ['addtime', '>=', strtotime($profit_date)]; } if ($user_id) { - $user_id = $user_id - 1260; + $user_id = $user_id ; $whe[] = ['pid', '=', $user_id]; } //select * from ( SELECT pid,count(1) n FROM xinglanmh_shequt_test.`user` where pid>0 group by pid ) t where n>1 order by n desc LIMIT 10 @@ -766,7 +766,7 @@ class User extends Base foreach ($user_list as $user_item) { $user_item['adddate'] = date('Y-m-d H:i:s', $user_item['addtime']); $user_item['index'] = $u_index; - $user_item['id'] = $user_item['id'] + 1260; + $user_item_order = Order::where('user_id', '=', $user_item['id'])->where('status', '=', $user_item['id'])->count(); $user_item_price = Order::where('user_id', '=', $user_item['id'])->where('status', '=', $user_item['id'])->sum('price'); $user_item['user_item_order'] = $user_item_order; @@ -782,7 +782,7 @@ class User extends Base } $data[] = [ 'index' => $index, - 'user_id' => $pid + 1260, + 'user_id' => $pid, 'invitenumber' => $item['n'], 'nickname' => $user_info['nickname'], 'headimg' => imageUrl($user_info['headimg']), diff --git a/app/admin/view/CouponReceive/index.html b/app/admin/view/CouponReceive/index.html index ca18287..0686612 100755 --- a/app/admin/view/CouponReceive/index.html +++ b/app/admin/view/CouponReceive/index.html @@ -61,7 +61,7 @@ {volist name="list" id="vo"} {$vo['id']} - {$vo['user_id']+1260} + {$vo['user_id']} {$vo['nickname']} {$vo['title']} {$vo['man_price']} diff --git a/app/admin/view/Finance/draw_list.html b/app/admin/view/Finance/draw_list.html index ba5fd74..c6a9f1b 100755 --- a/app/admin/view/Finance/draw_list.html +++ b/app/admin/view/Finance/draw_list.html @@ -51,7 +51,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

@@ -63,7 +63,7 @@
-

UID：{$vo['share_uid']+1260}

+

UID：{$vo['share_uid']}

{$vo['share_mobile']}

{$vo['share_nickname']}

diff --git a/app/admin/view/Finance/integral_list.html b/app/admin/view/Finance/integral_list.html index 27490a7..cb04395 100755 --- a/app/admin/view/Finance/integral_list.html +++ b/app/admin/view/Finance/integral_list.html @@ -50,7 +50,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Finance/money_list.html b/app/admin/view/Finance/money_list.html index 71c98e0..643b5d3 100755 --- a/app/admin/view/Finance/money_list.html +++ b/app/admin/view/Finance/money_list.html @@ -50,7 +50,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Finance/recharge_list.html b/app/admin/view/Finance/recharge_list.html index 27ba474..d3ed32f 100755 --- a/app/admin/view/Finance/recharge_list.html +++ b/app/admin/view/Finance/recharge_list.html @@ -49,7 +49,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Finance/record.html b/app/admin/view/Finance/record.html index 4828d23..8f74f1e 100755 --- a/app/admin/view/Finance/record.html +++ b/app/admin/view/Finance/record.html @@ -50,7 +50,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Order/buy_order.html b/app/admin/view/Order/buy_order.html index 04d5f62..d62d11b 100755 --- a/app/admin/view/Order/buy_order.html +++ b/app/admin/view/Order/buy_order.html @@ -58,7 +58,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Order/kadan_order.html b/app/admin/view/Order/kadan_order.html index af595d8..7d3ab29 100755 --- a/app/admin/view/Order/kadan_order.html +++ b/app/admin/view/Order/kadan_order.html @@ -56,7 +56,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Order/recovery_order.html b/app/admin/view/Order/recovery_order.html index 425a7a0..828b63f 100755 --- a/app/admin/view/Order/recovery_order.html +++ b/app/admin/view/Order/recovery_order.html @@ -51,7 +51,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Order/send_order.html b/app/admin/view/Order/send_order.html index 09beac6..2c0229f 100755 --- a/app/admin/view/Order/send_order.html +++ b/app/admin/view/Order/send_order.html @@ -79,7 +79,7 @@
-

UID：{$vo['user_id']+1260}

+

UID：{$vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/User/index.html b/app/admin/view/User/index.html index 0b505cc..c4bfa8a 100755 --- a/app/admin/view/User/index.html +++ b/app/admin/view/User/index.html @@ -63,7 +63,7 @@ {{d.nickname}}
@@ -75,7 +75,7 @@
diff --git a/app/admin/view/User/user_profit_loss.html b/app/admin/view/User/user_profit_loss.html index 652aacf..38375fa 100755 --- a/app/admin/view/User/user_profit_loss.html +++ b/app/admin/view/User/user_profit_loss.html @@ -65,7 +65,7 @@
-

UID：{$vo['id']+1260}

+

UID：{$vo['id']}

{$vo['nickname']}

diff --git a/app/admin/view/User/user_team.html b/app/admin/view/User/user_team.html index 89eb134..7e99c2c 100755 --- a/app/admin/view/User/user_team.html +++ b/app/admin/view/User/user_team.html @@ -59,7 +59,7 @@
-

UID：{$vo['id']+1260}

+

UID：{$vo['id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/api/controller/AliNotify.php b/app/api/controller/AliNotify.php index d33ab45..96e670a 100755 --- a/app/api/controller/AliNotify.php +++ b/app/api/controller/AliNotify.php @@ -835,7 +835,7 @@ class AliNotify extends Base if($randomValue<$nowpro){ $read_goods=$value1; Db::name('error_log')->insert([ - 'user_id' => $user_id+1260, + 'user_id' => $user_id, 'goods_id' => $ddp_goods['id'], 'addtime' => time(), 'content'=>'支付宝付费抽奖开启概率'.$randomValue.',累计概率'.$nowpro.',本商品概率'.$value1['pro'].',本商品名称'.$value1['title'].',抽取id'.$user_id, diff --git a/app/api/controller/Login.php b/app/api/controller/Login.php index fa4d96c..ae15670 100755 --- a/app/api/controller/Login.php +++ b/app/api/controller/Login.php @@ -23,7 +23,7 @@ class Login extends Base $this->uploader = new TencentCosUploader($config); } /** - * 微信授权 + * 微信授权，登录接口 */ public function login() { @@ -105,7 +105,6 @@ class Login extends Base $pid = 0; $pid_pid = request()->param('pid', 0); if ($pid_pid > 0) { - $pid_pid = $pid_pid - 1260; log::info("获取推荐人id" . $pid_pid); } $randx = rand(1000, 9999); @@ -282,7 +281,6 @@ class Login extends Base $pid = 0; $pid_pid = request()->param('pid', 0); if ($pid_pid > 0) { - $pid_pid = $pid_pid - 1260; log::info("获取推荐人id" . $pid_pid); } diff --git a/app/api/controller/User.php b/app/api/controller/User.php index 37caaee..23f9846 100755 --- a/app/api/controller/User.php +++ b/app/api/controller/User.php @@ -46,7 +46,7 @@ class User extends Base public function user(Request $request) { $user = $this->getUser(); - $userinfo['ID'] = $user['id'] + 1260; + $userinfo['ID'] = $user['id']; $userinfo['mobile_is'] = $user['mobile'] ? 1 : 0; $userinfo['nickname'] = $user['nickname']; $userinfo['headimg'] = imageUrl($user['headimg']);