1

app/common/repositories/user/UserRepository.php

@@ -21,7 +21,6 @@ use app\common\repositories\BaseRepository;
 use app\common\repositories\community\CommunityRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\service\StoreServiceRepository;
-use app\common\repositories\store\StorePercentageRepository;
 use app\common\repositories\system\attachment\AttachmentRepository;
 use app\common\repositories\wechat\WechatUserRepository;
 use crmeb\exceptions\AuthException;
@@ -529,7 +528,6 @@ class UserRepository extends BaseRepository
                 'sex' => $wechatUser['sex'] ?? 0,
                 'spread_uid' => 0,
                 'is_promoter' => 0,
-                'order_id' => $wechatUser['order_id'] ?? 0,
                 'last_time' => date('Y-m-d H:i:s'),
                 'last_ip' => $request->ip()
             ]);
@@ -933,14 +931,13 @@ class UserRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/22
      */
-    public function bindSpread(User $user, int $spreadUid, int $order_id)
+    public function bindSpread(User $user, int $spreadUid)
     {
         if ($spreadUid && !$user->spread_uid && $user->uid != $spreadUid && ($spread = $this->dao->get($spreadUid)) && $spread->spread_uid != $user->uid && !$spread->cancel_time) {
             $config = systemConfig(['extension_limit', 'extension_limit_day', 'integral_user_give']);
             event('user.spread.before', compact('user','spreadUid'));
-            Db::transaction(function () use ($spread, $spreadUid, $user, $config,$order_id) {
+            Db::transaction(function () use ($spread, $spreadUid, $user, $config) {
                 $user->spread_uid = $spreadUid;
-                $user->order_id = $order_id;
                 $user->spread_time = date('Y-m-d H:i:s');
                 if ($config['extension_limit'] && $config['extension_limit_day']) {
                     $user->spread_limit = date('Y-m-d H:i:s', strtotime('+ ' . $config['extension_limit_day'] . ' day'));
@@ -965,15 +962,6 @@ class UserRepository extends BaseRepository
                 //TODO 推广人周榜
                 Cache::zincrby('s_top_' . monday(), 1, $spreadUid);
             });
-            if($order_id){
-                //一级注册折扣百分比
-                $store_percentage = new StorePercentageRepository();
-                $store_percentage->deduction_percentage(1,$user->uid,$order_id);
-                //二级注册折扣百分比
-                if($spread->order_id){
-                    $store_percentage->deduction_percentage(2,$user->uid,$spread->order_id);
-                }
-            }
             Queue::push(UserBrokerageLevelJob::class, ['uid' => $spreadUid, 'type' => 'spread_user', 'inc' => 1]);
             app()->make(UserBrokerageRepository::class)->incMemberValue($user->uid, 'member_share_num', 0);
             event('user.spread', compact('user','spreadUid'));

app/controller/api/Auth.php

@@ -43,7 +43,6 @@ use think\facade\Cache;
 use think\facade\Log;
 use think\facade\Queue;
 use crmeb\jobs\SendSmsJob;
-use function Qiniu\explodeUpToken;
 
 /**
  * Class Auth
@@ -209,6 +208,7 @@ class Auth extends BaseController
         }
         /** @var WechatUserRepository $make */
         $make = app()->make(WechatUserRepository::class);
+
         $user = $make->syncUser($wechatInfo['openid'], $wechatInfo);
         if (!$user)
             return app('json')->fail('授权失败[003]');
@@ -566,9 +566,9 @@ class Auth extends BaseController
             Cache::set('u_try' . $key, ['id' => $authInfo['wechat_user_id'], 'type' => $authInfo['user_type'], 'spread' => $auth['auth']['spread'] ?? 0], 3600);
             return app('json')->status(201, compact('key'));
         }
-        $order_id = $auth['auth']['order_id'] ?? 0;
+
         if ($auth['auth']['spread'] ?? 0) {
-            $userRepository->bindSpread($user, (int)($auth['auth']['spread']),$order_id);
+            $userRepository->bindSpread($user, (int)($auth['auth']['spread']));
         }
         $tokenInfo = $userRepository->createToken($user);
         $userRepository->loginAfter($user);