Kirin 1 år sedan
förälder
incheckning
7885362373
3 ändrade filer med 21 tillägg och 21 borttagningar
  1. 19 19
      app/admin/controller/user/User.php
  2. 1 1
      app/models/order/PaymentReceived.php
  3. 1 1
      app/models/user/User.php

+ 19 - 19
app/admin/controller/user/User.php

@@ -463,7 +463,7 @@ class User extends AuthController
         $f[] = Form::radio('lock_spread', '推荐锁定', (string)$user->getData('lock_spread'))->options([['value' => 1, 'label' => '锁定'], ['value' => 0, 'label' => '解锁']]);
         $f[] = Form::select('group_level', '团队等级', (string)$user->getData('group_level'))->options(array_merge([['value' => 0, 'label' => '无']], SystemGroupLevel::field('id as value,name as label')->select()->toArray()));
         $f[] = Form::select('award_level', '级差等级', (string)$user->getData('award_level'))->options(array_merge([['value' => 0, 'label' => '无']], SystemAwardLevel::field('id as value,name as label')->select()->toArray()));
-//        $f[] = Form::select('m_spread_uid', '异业推荐人', (string)$user->getData('m_spread_uid'))->options(array_merge([['value' => 0, 'label' => '无']], UserModel::where('uid', '<>', $uid)->field('uid as value,nickname as label')->select()->toArray()))->filterable(true);
+        $f[] = Form::select('m_spread_uid', '异业推荐人', (string)$user->getData('m_spread_uid'))->options(array_merge([['value' => 0, 'label' => '无']], UserModel::where('uid', '<>', $uid)->field('uid as value,nickname as label')->select()->toArray()))->filterable(true);
         $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'));
@@ -487,7 +487,7 @@ class User extends AuthController
             ['spread_uid', 0],
             ['group_level', 0],
             ['award_level', 0],
-//            ['m_spread_uid', 0],
+            ['m_spread_uid', 0],
             ['lock_spread', 0],
         ]);
         if (!$uid) return $this->failed('数据不存在');
@@ -554,23 +554,23 @@ class User extends AuthController
         if ($data['spread_uid'] != $user['spread_uid']) {
             $res_sp = \app\models\user\User::setSpread($data['spread_uid'], $uid);
         }
-//        if ($data['m_spread_uid'] != $user['m_spread_uid']) {
-//            if ($uid == $data['m_spread_uid']) {
-//                return Json::fail('不可绑定自己');
-//            }
-//            $spread_uid = $data['m_spread_uid'];
-//            $sp = $data['m_spread_uid'];
-//            $userlist = \app\models\user\User::column('uid,m_spread_uid', 'uid');
-//            while ($sp) {
-//                if ($sp == $uid) {
-//                    $spread_uid = 0;
-//                    break;
-//                }
-//                $sp = $userlist[$sp]['m_spread_uid'] ?? 0;
-//            }
-//            if (!$spread_uid) return Json::fail('绑定用户不满足');
-//            $edit['m_spread_uid'] = $data['m_spread_uid'];
-//        }
+        if ($data['m_spread_uid'] != $user['m_spread_uid']) {
+            if ($uid == $data['m_spread_uid']) {
+                return Json::fail('不可绑定自己');
+            }
+            $spread_uid = $data['m_spread_uid'];
+            $sp = $data['m_spread_uid'];
+            $userlist = \app\models\user\User::column('uid,m_spread_uid', 'uid');
+            while ($sp) {
+                if ($sp == $uid) {
+                    $spread_uid = 0;
+                    break;
+                }
+                $sp = $userlist[$sp]['m_spread_uid'] ?? 0;
+            }
+            if (!$spread_uid) return Json::fail('绑定用户不满足');
+            $edit['m_spread_uid'] = $data['m_spread_uid'];
+        }
         $edit['status'] = $data['status'];
         $edit['real_name'] = $data['real_name'];
         $edit['phone'] = $data['phone'];

+ 1 - 1
app/models/order/PaymentReceived.php

@@ -105,7 +105,7 @@ class PaymentReceived extends BaseModel
                     User::where('uid', $collect_uid)->inc($field, $now_money)->update();
                     $res1 = UserBill::income('扫码收款-' . $title, $collect_uid, 'now_money', 'qr_add_' . $field, $now_money, $res['id'], bcadd($collect_user[$field], $now_money, 2), $str);
                 }
-                $spread = User::get($collect_user['spread_uid']);
+                $spread = User::get($collect_user['m_spread_uid']);
                 $res3 = true;
                 if ($spread && $recommend > 0) {
                     User::where('uid', $spread['uid'])->inc($field, $recommend)->update();

+ 1 - 1
app/models/user/User.php

@@ -382,7 +382,7 @@ class User extends BaseModel
                         $res1 = StoreBill::income('商品销售额', $store_info['id'], 'product_sale', $v, $orderInfo['id'], $balance, $mark);
                         $res2 = SystemStore::bcInc($store_info['id'], 'money', $v, 'id');
                         $res = $res && $res1 && $res2;
-                        $spread = User::getUserInfo($store_info['spread_uid']);
+                        $spread = User::getUserInfo($store_info['m_spread_uid']);
                         if ($spread) {
                             $brokeragePrice2 = bcmul(bcdiv($store_info['recommend'], 100, 4), $v, 2);
                             if ($brokeragePrice2 > 0) {