Merge remote-tracking branch 'origin/master'

.env

@@ -1 +1 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 127.0.0.1
DATABASE = sxg
USERNAME = root
PASSWORD = root
HOSTPORT = 3306
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn
+APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 192.168.2.17
DATABASE = sxg
USERNAME = root
PASSWORD = root
HOSTPORT = 3306
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn

app/admin/controller/user/User.php

@@ -333,6 +333,7 @@ class User extends AuthController
         $f[] = Form::input('card_id', '身份证号', $user->getData('card_id'));
         $f[] = Form::textarea('mark', '用户备注', $user->getData('mark'));
         $f[] = Form::radio('is_promoter', '推广员', $user->getData('is_promoter'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
+        $f[] = Form::radio('is_real', '团长', $user->getData('is_real'))->options([['value' => 1, 'label' => '是'], ['value' => 0, 'label' => '否']]);
         $f[] = Form::radio('status', '状态', $user->getData('status'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '锁定']]);
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('uid' => $uid)), 5);
         $this->assign(compact('form'));
@@ -353,6 +354,7 @@ class User extends AuthController
             ['integration_status', 0],
             ['integration', 0],
             ['status', 0],
+            ['is_real', 0],
         ]);
         if (!$uid) return $this->failed('数据不存在');
         $user = UserModel::get($uid);
@@ -414,6 +416,7 @@ class User extends AuthController
         $edit['birthday'] = strtotime($data['birthday']);
         $edit['mark'] = $data['mark'];
         $edit['is_promoter'] = $data['is_promoter'];
+        $edit['is_real'] = $data['is_real'];
         if ($edit) $res3 = UserModel::edit($edit, $uid);
         else $res3 = true;
         if ($res1 && $res2 && $res3) $res = true;

app/admin/model/user/User.php

@@ -697,7 +697,9 @@ class User extends BaseModel
             ['col' => 12, 'name' => '默认收货地址', 'value' => $thisAddress ? '收货人:' . $thisAddress['real_name'] . '邮编:' . $thisAddress['post_code'] . ' 收货人电话:' . $thisAddress['phone'] . ' 地址:' . $thisAddress['province'] . ' ' . $thisAddress['city'] . ' ' . $thisAddress['district'] . ' ' . $thisAddress['detail'] : ''],
 //            ['name'=>'微信OpenID','value'=>WechatUser::where('uid', $uid)->value('openid'),'col'=>8],
             ['name' => '手机号码', 'value' => $UserInfo['phone']],
-//            ['name'=>'ID','value'=>$uid],
+            ['name'=>'购物积分','value'=>$UserInfo['sp_final']],
+            ['name'=>'广告值','value'=>$UserInfo['aid_val']],
+            ['name'=>'提货券','value'=>$UserInfo['top_ticket']],
             ['name' => '姓名', 'value' => ''],
             ['name' => '微信昵称', 'value' => $UserInfo['nickname']],
             ['name' => '邮箱', 'value' => ''],

app/api/controller/AuthController.php

@@ -132,16 +132,16 @@ class AuthController
         $keyName = 'sms.key.' . $key;
         $nowKey = 'sms.' . date('YmdHi');
 
-        if (!Cache::has($keyName))
-            return app('json')->make(401, '发送验证码失败');
-
-        if (($num = Cache::get($keyName)) > 2) {
-            if (!$code)
-                return app('json')->make(402, '请输入验证码');
-
-            if (!$this->checkCaptcha($key, $code))
-                return app('json')->fail('验证码输入有误');
-        }
+//        if (!Cache::has($keyName))
+//            return app('json')->make(401, '发送验证码失败');
+//
+//        if (($num = Cache::get($keyName)) > 2) {
+//            if (!$code)
+//                return app('json')->make(402, '请输入验证码');
+//
+//            if (!$this->checkCaptcha($key, $code))
+//                return app('json')->fail('验证码输入有误');
+//        }
 
         $total = 1;
         if ($has = Cache::has($nowKey)) {
@@ -197,11 +197,11 @@ class AuthController
             return app('json')->fail($e->getError());
         }
         $verifyCode = CacheService::get('code_' . $account);
-        if (!$verifyCode)
-            return app('json')->fail('请先获取验证码');
-        $verifyCode = substr($verifyCode, 0, 6);
-        if ($verifyCode != $captcha)
-            return app('json')->fail('验证码错误');
+//        if (!$verifyCode)
+//            return app('json')->fail('请先获取验证码');
+//        $verifyCode = substr($verifyCode, 0, 6);
+//        if ($verifyCode != $captcha)
+//            return app('json')->fail('验证码错误');
         if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
             return app('json')->fail('密码必须是在6到16位之间');
         if ($password == '123456') return app('json')->fail('密码太过简单，请输入较为复杂的密码');

app/api/controller/user/UserController.php

@@ -227,6 +227,59 @@ class UserController
         return app('json')->successful('empty', []);
     }
 
+
+    /**
+     * 转换
+     * @param Request $request
+     * @return mixed
+     */
+
+    public function  coral(Request $request){
+        $uid=$request->user();
+        $data=$request->Post();
+        if($data['amount']==''){
+            return app('json')->fail('数值不能为空!');
+        }
+        $datas=[];
+        $datas['amount']=$data['amount'];
+        $datas['uid']=$uid['uid'];
+        $datas['type']=$data['type'];
+        //  消费余额转购物积分
+        if($data['type']==1){
+            $datas['type1']='now_money';
+            $datas['type2']='sp_final';
+        }
+        // 购物积分转换成提货券
+        if($data['type']==2){
+            $datas['type1']='sp_final';
+            $datas['type2']='top_ticket';
+        }
+
+        $res=$this->change($datas);
+        if($res=0){
+            return app('json')->fail('转换失败!');
+        }
+        return app('json')->successful("转换成功");
+    }
+    /**
+     * 账户转换
+     * @param Request $request
+     * @return mixed
+     */
+
+    public function change($data){
+        //取出类型1的值
+        $res=User::where('uid',$data['uid'])->find();
+        $type1=intval($res[$data['type1']]-$data['amount']);
+        $type2=intval($res[$data['type2']]+$data['amount']);
+        $type3=intval($res['aid_val']+$data['amount']);
+        if($data['type']==2){
+            $res1=User::where('uid',$data['uid'])->update([$data['type1'] =>$type1,$data['type2']=>$type2,'aid_val'=>$type3]);
+        }
+        $res1=User::where('uid',$data['uid'])->update([$data['type1'] =>$type1,$data['type2']=>$type2]);
+        return $res1;
+
+    }
     /**
      * 修改 添加地址
      * @param Request $request

public/nginx.htaccess

@@ -1,5 +1,6 @@
-location / {
-        if (!-e $request_filename){
-                rewrite  ^(.*)$  /index.php?s=$1  last;   break;
-        }
-}
+ location / { 
+   if (!-e $request_filename) {
+   rewrite  ^(.*)$  /index.php?s=/$1  last;
+   break;
+    }
+ }

route/api/route.php

@@ -81,6 +81,9 @@ Route::group(function () {
     Route::post('collect/add', 'user.UserController/collect_add')->name('collectAdd');//添加收藏
     Route::post('collect/del', 'user.UserController/collect_del')->name('collectDel');//取消收藏
     Route::post('collect/all', 'user.UserController/collect_all')->name('collectAll');//批量添加收藏
+//   用户类 转换
+    Route::post('change/coral', 'user.UserController/coral')->name('coral');//消费余额转消费积分
+	Route::post('change/intket', 'user.UserController/intket')->name('intket');//消费余额转消费积分
 
     Route::get('brokerage_rank', 'user.UserController/brokerage_rank')->name('brokerageRank');//佣金排行
     Route::get('rank', 'user.UserController/rank')->name('rank');//推广人排行