Merge branch 'master' of http://192.168.0.204/pd-new/pd-user

src/main/java/com/pangding/web/authority/dao/CompanyBankCardDao.java

@@ -23,6 +23,4 @@ public interface CompanyBankCardDao extends BaseDao {
      * @param setNotDefaultReqVo 设置非默认的请求对象
      */
     void setNotDefault(CompanyBankCardSetNotDefaultReqVo setNotDefaultReqVo);
-
-    void checkBankCardCode(CompanyBankCardVo checkReqVo);
 }

src/main/java/com/pangding/web/authority/dao/impl/CompanyBankCardDaoImpl.java

@@ -16,7 +16,6 @@ import org.springframework.stereotype.Component;
 public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCardDao {
     private static final String GET_BANK_CARD_LIST = "GET_BANK_CARD_LIST";
     private static final String SET_NOT_DEFAULT = "SET_NOT_DEFAULT";
-    private static final String CHECK_BANK_CARD_CODE = "CHECK_BANK_CARD_CODE";
 
     @Override
     protected void init() {
@@ -28,8 +27,6 @@ public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCa
         table.add(SET_NOT_DEFAULT,"update pd_company_bank_card a set a.is_default = 0 where 1=1 ")
                 .add("id","and id = ?")
                 .add("companyId","and company_id = ?");
-
-        table.addExist(CHECK_BANK_CARD_CODE,"bank_card_code");
     }
 
     /**
@@ -46,9 +43,4 @@ public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCa
     public void setNotDefault(CompanyBankCardSetNotDefaultReqVo setNotDefaultReqVo) {
         this.updateSql(SET_NOT_DEFAULT,setNotDefaultReqVo);
     }
-
-    @Override
-    public void checkBankCardCode(CompanyBankCardVo checkReqVo) {
-        this.checkExist(CHECK_BANK_CARD_CODE,checkReqVo,"该银行卡号已存在");
-    }
 }

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -471,9 +471,12 @@ public class CompanyServiceImpl implements CompanyService {
         if (null != reqVo.getId() && !"".equals(reqVo.getId())) {
             /*检查银行卡号是否存在*/
             CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
-            checkReqVo.setId(reqVo.getId());
+            checkReqVo.setCompanyId(reqVo.getCompanyId());
             checkReqVo.setBankCardCode(reqVo.getBankCardCode());
-            companyBankCardDao.checkBankCardCode(checkReqVo);
+            CompanyBankCardVo companyBankCardVo1 = companyBankCardDao.load(checkReqVo,CompanyBankCardVo.class);
+            if (null != companyBankCardVo1 && !reqVo.getId().equals(companyBankCardVo1.getId())){
+                throw new CodeException("该银行卡已绑定");
+            }
 
             getReqVo.setId(reqVo.getId());
             CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
@@ -490,7 +493,11 @@ public class CompanyServiceImpl implements CompanyService {
             /*检查银行卡号是否存在*/
             CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
             checkReqVo.setBankCardCode(reqVo.getBankCardCode());
-            companyBankCardDao.checkBankCardCode(checkReqVo);
+            checkReqVo.setCompanyId(reqVo.getCompanyId());
+            CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(checkReqVo,CompanyBankCardVo.class);
+            if (null != companyBankCardVo){
+                throw new CodeException("该银行卡已绑定");
+            }
 
             reqVo.setId(id);
             BankCardListReqVo reqVo1 = new BankCardListReqVo();