commit

app/api/controller/wechat/AuthController.php

@@ -56,16 +56,18 @@ class AuthController
                 return app('json')->fail('获取session_key失败，请检查您的配置！', ['line' => $e->getLine(), 'message' => $e->getMessage()]);
             }
         }
-
         $data = UtilService::postMore([
             ['spread_spid', 0],
             ['spread_code', ''],
             ['iv', ''],
             ['encryptedData', ''],
+            ['iv1', ''],
+            ['encryptedData1', ''],
         ]);//获取前台传的code
         try {
             //解密获取用户信息
             $userInfo = MiniProgramService::encryptor($session_key, $data['iv'], $data['encryptedData']);
+            $userPhone = MiniProgramService::encryptor($session_key, $data['iv1'], $data['encryptedData1']);
         } catch (\Exception $e) {
             if ($e->getCode() == '-41003') return app('json')->fail('获取会话密匙失败');
         }
@@ -76,6 +78,7 @@ class AuthController
         $userInfo['code'] = $data['spread_code'];
         $userInfo['session_key'] = $session_key;
         $userInfo['login_type'] = $login_type;
+        $userInfo['phone'] = $userPhone['phoneNumber'];
         $uid = WechatUser::routineOauth($userInfo);
         $userInfo = User::where('uid', $uid)->find();
         if ($userInfo->login_type == 'h5' && ($h5UserInfo = User::where(['account' => $userInfo->phone, 'phone' => $userInfo->phone, 'user_type' => 'h5'])->find()))

app/models/store/StoreOrder.php

@@ -800,15 +800,15 @@ class StoreOrder extends BaseModel
                     User::where('uid', $user['spread_uid'])->inc('brokerage_price', $price1)->update();
                     $user1['brokerage_price'] += $price1;
                     UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
-                    if ($user1['level'] == 2){
-                        $fh = ($product['price'] * $num - 99 * $num) - $price3;// 结算差价
-                        User::where('uid', $user['spread_uid'])->inc('brokerage_price', $fh)->update();
-                        UserBill::income('结算差价', $user1['uid'], 'now_money', 'jscj', $fh, $user['uid'], $user1['brokerage_price']+$fh, '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id'].'结算差价');
-                    }elseif ($user1['level'] == 3){
-                        $fh = ($product['price'] * $num - 80 * $num) - $price3;// 结算差价
-                        User::where('uid', $user['spread_uid'])->inc('brokerage_price', $fh)->update();
-                        UserBill::income('结算差价', $user1['uid'], 'now_money', 'jscj', $fh, $user['uid'], $user1['brokerage_price']+$fh, '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id'].'结算差价');
-                    }
+//                    if ($user1['level'] == 2){
+//                        $fh = ($product['price'] * $num - 99 * $num) - $price3;// 结算差价
+//                        User::where('uid', $user['spread_uid'])->inc('brokerage_price', $fh)->update();
+//                        UserBill::income('结算差价', $user1['uid'], 'now_money', 'jscj', $fh, $user['uid'], $user1['brokerage_price']+$fh, '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id'].'结算差价');
+//                    }elseif ($user1['level'] == 3){
+//                        $fh = ($product['price'] * $num - 80 * $num) - $price3;// 结算差价
+//                        User::where('uid', $user['spread_uid'])->inc('brokerage_price', $fh)->update();
+//                        UserBill::income('结算差价', $user1['uid'], 'now_money', 'jscj', $fh, $user['uid'], $user1['brokerage_price']+$fh, '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id'].'结算差价');
+//                    }
                 }
                 if ($user2){
                     User::where('uid', $user1['spread_uid'])->inc('brokerage_price', $price3)->update();

app/models/user/User.php

@@ -110,6 +110,7 @@ class User extends BaseModel
     public static function updateWechatUser($wechatUser, $uid)
     {
         $userInfo = self::where('uid', $uid)->find();
+        if ($userInfo['status'] == 0) exception('用户已被禁用!');
         if (!$userInfo) return;
         //增加成为分销权限
         if (!$userInfo->is_promoter) {
@@ -122,6 +123,7 @@ class User extends BaseModel
             return self::edit([
                 'nickname' => $wechatUser['nickname'] ?: '',
                 'avatar' => $wechatUser['headimgurl'] ?: '',
+                'phone' => $wechatUser['phone'],
                 'is_promoter' => $status ? 1 : $userInfo->is_promoter,
                 'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
             ], $uid, 'uid');
@@ -129,6 +131,7 @@ class User extends BaseModel
             $data = [
                 'nickname' => $wechatUser['nickname'] ?: '',
                 'avatar' => $wechatUser['headimgurl'] ?: '',
+                'phone' => $wechatUser['phone'],
                 'is_promoter' => $status ? 1 : $userInfo->is_promoter,
                 'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
 //                'spread_uid' => 0,
@@ -224,7 +227,8 @@ class User extends BaseModel
             'add_ip' => request()->ip(),
             'last_time' => time(),
             'last_ip' => request()->ip(),
-            'user_type' => $routineUser['user_type']
+            'user_type' => $routineUser['user_type'],
+            'phone' => $routineUser['phone'],
         ]);
         $res = $res1 && $res2 && UserSpread::setSpread($routineUser['uid'], $spread_uid);
         self::checkTrans($res);

app/models/user/UserBill.php

@@ -65,7 +65,7 @@ class UserBill extends BaseModel
             if ($page) {
                 $list = self::where('uid', $uid)
                     ->where('category', 'now_money')
-                    ->where('type', 'in','brokerage,shares,team,push,jt_push,extract')
+                    ->where('type', 'in','brokerage,shares,team,push,jt_push,extract,jscj')
                     ->field('mark,pm,number,add_time')
                     ->where('status', 1)
                     ->where($where)
@@ -83,7 +83,7 @@ class UserBill extends BaseModel
                     ->select();
             }
             $data['zc'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'extract')->where('pm', 0)->sum('number');
-            $data['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'in','brokerage,shares,team,push,jt_push')->where('pm', 1)->sum('number');
+            $data['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'in','brokerage,shares,team,push,jt_push,jscj')->where('pm', 1)->sum('number');
             $data['list'] = count($list) ? $list->toArray() : [];
             foreach ($data['list'] as &$v) {
                 $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
@@ -94,7 +94,7 @@ class UserBill extends BaseModel
             if ($page) {
                 $list = self::where('uid', $uid)
                     ->where('category', $category)
-                    ->where('type', 'notIn', 'brokerage,shares,team,push,jt_push,extract')
+                    ->where('type', 'notIn', 'brokerage,shares,team,push,jt_push,extract,jscj')
                     ->field('mark,pm,number,add_time')
                     ->where('status', 1)
                     ->where($where)
@@ -112,7 +112,7 @@ class UserBill extends BaseModel
                     ->select();
             }
             $data['zc'] = self::where('uid', $uid)->where('category', $category)->where('type', 'notIn', 'extract')->where('pm', 0)->sum('number');
-            $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('type', 'notIn', 'brokerage,shares,team,push,jt_push')->where('pm', 1)->sum('number');
+            $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('type', 'notIn', 'brokerage,shares,team,push,jt_push,jscj')->where('pm', 1)->sum('number');
             $data['list'] = count($list) ? $list->toArray() : [];
             foreach ($data['list'] as &$v) {
                 $v['add_time'] = date('Y/m/d H:i', $v['add_time']);

app/models/user/WechatUser.php

@@ -80,6 +80,7 @@ class WechatUser extends BaseModel
     public static function routineOauth($routine)
     {
         $routineInfo['nickname'] = filter_emoji($routine['nickName']);//姓名
+        $routineInfo['phone'] = $routine['phone'];//姓名
         $routineInfo['sex'] = $routine['gender'];//性别
         $routineInfo['language'] = $routine['language'];//语言
         $routineInfo['city'] = $routine['city'];//城市