理财

app/admin/controller/finance/Finance.php

@@ -171,7 +171,8 @@ class Finance extends AuthController
                 && CashTradeOrder::brokerage($id);
             BaseModel::checkTrans($res);
             if ($res) {
-                return app('json')->success('审核成功');
+                Json::successful('审核成功');
+//                return app('json')->success('审核成功');
             } else {
                 return app('json')->fail('审核失败');
             }
@@ -189,7 +190,7 @@ class Finance extends AuthController
             $res = $res && CashTradeOrder::where('id', $id)->update(['status' => 2, 'end_time' => time()]);
             BaseModel::checkTrans($res);
             if ($res) {
-                return app('json')->success('退回成功');
+                Json::successful('退回成功');
             } else {
                 return app('json')->fail('退回失败');
             }

app/api/controller/AuthController.php

@@ -242,17 +242,17 @@ class AuthController
             return app('json')->fail('两次输入的交易密码不一致');
         }
 //        if (!$invite_code && User::count() > 0) return app('json')->fail('请输入邀请码');
-        if ($phone) {
-            if (!$captcha) {
-                return app('json')->fail('请输入验证码');
-            }
-            $verifyCode = CacheService::get('code_' . $phone);
-            if (!$verifyCode)
-                return app('json')->fail('请先获取验证码');
-            $verifyCode = substr($verifyCode, 0, 6);
-            if ($verifyCode != $captcha)
-                return app('json')->fail('验证码错误');
-        }
+//        if ($phone) {
+//            if (!$captcha) {
+//                return app('json')->fail('请输入验证码');
+//            }
+//            $verifyCode = CacheService::get('code_' . $phone);
+//            if (!$verifyCode)
+//                return app('json')->fail('请先获取验证码');
+//            $verifyCode = substr($verifyCode, 0, 6);
+//            if ($verifyCode != $captcha)
+//                return app('json')->fail('验证码错误');
+//        }
         if (!$phone && !$email) {
             return app('json')->fail('请输入对应注册方式的账号');
         }

app/api/controller/user/UserController.php

@@ -7,6 +7,7 @@ use app\models\system\SystemCity;
 use app\models\trade\CashTradeOrder;
 use app\models\user\UserMoney;
 use app\models\user\UserVisit;
+use crmeb\services\CacheService;
 use crmeb\services\ZtPayService;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -713,6 +714,35 @@ class UserController
         $user = $request->user();
         if ($user['real_check'] == 1) return app('json')->fail('账号或主账号已实名认证');
         list($idcard, $realname, $idcard_front, $idcard_hold, $idcard_back) = UtilService::postMore([['id_card', ''], ['real_name', ''], ['idcard_front', ''], ['idcard_hold', ''], ['idcard_back', '']], $request, true);
+        $email_update = [];
+        if ($user['email'] == '') {
+            list($email, $captcha) = UtilService::postMore([['email', ''], ['captcha', '']], $request, true);
+            if ($email) {
+                if (User::be(['email' => $email])) {
+                    return app('json')->fail('邮箱已被绑定');
+                }
+                if (!$captcha) {
+                    return app('json')->fail('请输入验证码');
+                }
+                $verifyCode = CacheService::get('code_' . $email);
+                if (!$verifyCode)
+                    return app('json')->fail('请先获取验证码');
+                $verifyCode = substr($verifyCode, 0, 6);
+                if ($verifyCode != $captcha)
+                    return app('json')->fail('验证码错误');
+                $email_update['email'] = $email;
+            }
+            return app('json')->fail('请绑定邮箱');
+        }
+        $update = array_merge([
+            'real_name' => $realname,
+            'card_id' => $idcard,
+            'real_check' => 0,
+            'idcard_front' => $idcard_front,
+            'idcard_hold' => $idcard_hold,
+            'idcard_back' => $idcard_back
+        ], $email_update);
+
 //        $url = 'http://op.juhe.cn/idcard/queryEncry';
 //        $key = sys_config('real_name_key');
 //        $openid = sys_config('real_name_openid');
@@ -725,7 +755,7 @@ class UserController
 //        $res = do_request($url, $data, null, false);
 //        if (isset($res['result']['res']) && $res['result']['res'] == 1) {
         try {
-            $res = User::where('uid', $user['main_uid'] ?: $user['uid'])->update(['real_name' => $realname, 'card_id' => $idcard, 'real_check' => 0, 'idcard_front' => $idcard_front, 'idcard_hold' => $idcard_hold, 'idcard_back' => $idcard_back]);
+            $res = User::where('uid', $user['main_uid'] ?: $user['uid'])->update($update);
             if ($res) {
                 return app('json')->success('已提交认证');
             } else {

app/http/middleware/AuthTokenMiddleware.php

@@ -52,6 +52,9 @@ class AuthTokenMiddleware implements MiddlewareInterface
                         $authInfo['user']['card_id'] = $main_user['card_id'];
                     }
                 }
+//                if (!$authInfo['user']['real_check'] && !in_array($request->action(), ['realNameCheck', 'logout', 'user', 'userinfo'])) {
+//                    throw new AuthException('请先进行实名认证');
+//                }
                 if (!$authInfo['user']->is_promoter) {
                     $price = StoreOrder::where(['paid' => 1, 'refund_status' => 0, 'uid' => $authInfo['user']['uid']])->sum('pay_price');
                     $status = is_brokerage_statu($price);

app/models/trade/CashTradeOrder.php

@@ -482,9 +482,9 @@ class CashTradeOrder extends BaseModel
     {
         $info = self::get($id);
         if ($info['trade_type'] == 2)
-            $user = User::getUserInfo($info['uid']);
-        else
             $user = User::getUserInfo($info['trade_uid']);
+        else
+            $user = User::getUserInfo($info['uid']);
         $uper = User::getUserInfo($user['spread_uid']);
 //        var_dump($info);
 //        var_dump($user['uid']);
@@ -497,7 +497,7 @@ class CashTradeOrder extends BaseModel
             if ($ratio > 0) {
                 $brokerage = bcmul($ratio, $info['money_num'], 8);
                 if ($brokerage > $send) {
-                    $brokerage = bcdiv($brokerage, $send, 8);
+                    $brokerage = bcsub($brokerage, $send, 8);
                     $res = $res && UserMoney::incomeMoney($uper['uid'], $info['money_type'], $brokerage, 'return_uper', '佣金', $user['nickname'] . '发生交易，获得佣金');
                     $send = bcadd($brokerage, $send, 8);
                 }

route/api/route.php

@@ -196,7 +196,7 @@ Route::group(function () {
     Route::post('spread/order', 'user.UserBillController/spread_order')->name('spreadOrder');//推广订单
     Route::get('spread/commission/:type', 'user.UserBillController/spread_commission')->name('spreadCommission');//推广佣金明细
     Route::get('spread/count/:type', 'user.UserBillController/spread_count')->name('spreadCount');//推广 佣金 3/提现 4 总和
-    Route::get('spread/banner/:uid', 'user.UserBillController/spread_banner')->name('spreadBanner');//推广分销二维码海报生成
+    Route::get('spread/banner', 'user.UserBillController/spread_banner')->name('spreadBanner');//推广分销二维码海报生成
     Route::post('spread/ratio/:uid', 'user.UserBillController/setReturnUper')->name('setReturnUper');//设置佣金比例
     Route::get('integral/list', 'user.UserBillController/integral_list')->name('integralList');//积分记录
     //提现类