取消绑定

application/models/Business/User/MemberService.php

@@ -603,7 +603,7 @@ class MemberServiceModel extends \Business\AbstractModel
         $memberMappingDao = \DAO\MemberMappingModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $memberMappingDao->validCancelMapping($data,$memberId);
         $where['member_id'] = $memberId;
-        $where['user_type'] = ($data['userType']==\Our\ApiConst::userFromWx)?array('in',array(\Our\ApiConst::userFromWx,\Our\ApiConst::wechatUserType)):$data['userType'];
+        $where['user_type'] = ($data['userType']==\Our\ApiConst::userFromWx||$data['userType']==\Our\ApiConst::wechatUserType)?array('in',array(\Our\ApiConst::userFromWx,\Our\ApiConst::wechatUserType)):$data['userType'];
         $result = $memberMappingDao->del($where);
         if(!$result){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::cancelBindingUserFailed);

application/models/DAO/MemberMapping.php

@@ -113,6 +113,9 @@ class MemberMappingModel extends \DAO\AbstractModel{
         if(!$where['userType']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyUserType);
         }
+        if(!in_array($where['userType'],array_keys(\Our\ArrayConst::userType))){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongUserType);
+        }
         $condition['member_id'] = $memberId;
         $condition['user_type'] = ($where['userType']==\Our\ApiConst::userFromWx||$where['userType']==\Our\ApiConst::wechatUserType)?array('in',array(\Our\ApiConst::userFromWx,\Our\ApiConst::wechatUserType)):$where['userType'];
         $result = $this->find($condition,'member_id');