赠送积分和角色管理

@@ -63,12 +63,15 @@ class FriendController extends HomeBaseController
             $total = $request->param('total');
             //获取赠送者角色、父级、当前积分和赠送密码
             $info = Db::name('user')->field('role,parent_id,balance,integral_pwd')->where(['id' => $uid])->find();
-            $integral_pwd = (empty($request->param('integral_pwd'))) ? $info['integral_pwd'] : $request->param('integral_pwd');
-            //判断密码是否正确
+            $integral_pwd = $request->param('integral_pwd');
+            //判断密码是否正确（加好友时不用验证密码）
+            if ($total > 0) {
                 if (md5($integral_pwd) != $info['integral_pwd']) {
                     echo json_encode(['msg' => '密码错误', 'status' => false]);
                     exit();
-            } else {
+                }
+            }
+
             //判断此人积分是否足够赠送，且是否能被500整除
             if ($info['balance'] < $total && $total >= 0) {
                 echo json_encode(['msg' => '您的积分不足', 'status' => false]);
@@ -176,7 +179,6 @@ class FriendController extends HomeBaseController
             }
         }
     }
-    }
 
     //密码管理验证码页面
     public function passwordManager()