设置支付密码

app/client/controllers/OrderController.php

@@ -140,15 +140,12 @@ class OrderController extends BaseController
 		$payPassword = isset($post['payPassword']) ? $post['payPassword'] : 0;
 		$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
 		$order = OrderService::getByOrderSn($orderSn);
-		
-		//dd(password_hash('123456', PASSWORD_BCRYPT));
-		
+		$userId = $this->userId;
+		$user = UserService::getUserInfo($userId, false);
 		//验证支付密码是否正确
-		UserService::validPayPassword($payPassword, $this->user);
-		
+		UserService::validPayPassword($payPassword, $user);
 		//验证订单有效性
 		OrderService::check($order, $this->userId);
-		
 		$typeList = configDict::getConfig('capitalType');
 		$capitalType = $typeList['xhOrder']['id'];
 		$totalFee = $order['actPrice'];
@@ -246,7 +243,7 @@ class OrderController extends BaseController
 			$sourceType = 2;
 		}
 		$sourceType = isset($post['sourceType']) ? $post['sourceType'] : 0;
-
+		
 		$post['userId'] = $this->userId;
 		$prePrice = round($post['prePrice'], 2);
 		$couponId = isset($post['couponId']) ? $post['couponId'] : 0;

biz/user/services/UserService.php

@@ -161,11 +161,11 @@ class UserService extends BaseService
 	{
 		return UserClass::getUserByIds($ids);
 	}
-	
+
 	//验证支付密码是否正确 shish 2019.12.6
 	public static function validPayPassword($password, $user)
 	{
-		if (isset($user['payPassword']) == false || empty($user['payPassword'])) {
+		if (isset($user['hasPayPwd']) == false || $user['hasPayPwd'] == 0) {
 			util::fail('您还没有设置支付密码');
 		}
 		$payPassword = $user['payPassword'];
@@ -173,7 +173,7 @@ class UserService extends BaseService
 			util::fail('密码错误');
 		}
 	}
-	
+
 	//验证用户权限
 	public static function valid($info, $merchantId)
 	{