user/role/tright 7.12

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

@@ -196,7 +196,7 @@ public class CompanyServiceImpl implements CompanyService {
             companyReqVo.getBankList().add(companyBankReqVo);
         }
         /*注册*/
-        /*ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())){
             throw new CodeException("获取失败，请重试");
         }
@@ -204,15 +204,14 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyVo companyVo1 = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo1,res);
         companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
-        companyVo1.setExamineStatus(companyVo.getExamineStatus());*/
-        /*以上先注释掉，之前要把下面两行代码修改*/
+        companyVo1.setExamineStatus(companyVo.getExamineStatus());
+
         /*保存公司主表*/
-        companyDao.create(companyVo);
-        resVo.setCompanyId(companyVo.getId());
+        companyDao.create(companyVo1);
+        resVo.setCompanyId(companyVo1.getId());
 
         /*保存银行卡表*/
-        /*之后要将companyReqVo.getBankList()改为res.getBankList()*/
-        List<CompanyBankReqVo> companyBankReqVoList = companyReqVo.getBankList();
+        List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
         if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()) {
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
             CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
@@ -337,23 +336,21 @@ public class CompanyServiceImpl implements CompanyService {
         }
 
         /*注册服务验证验证码*/
-        /*ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())){
             throw new CodeException("验证失败，请重试");
-        }*/
+        }
 
         /*更新公司主表*/
-        /*CompanyReqVo res = (CompanyReqVo) result.getData();
+        CompanyReqVo res = (CompanyReqVo) result.getData();
         CompanyVo companyVo1 = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo1,res);
         companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
-        companyVo1.setExamineStatus(companyVo.getExamineStatus());*/
-        /*以上先注释掉，之后下面一行需要由companyDao.update(companyVo)改为companyDao.update(companyVo1);*/
-        companyDao.update(companyVo);
+        companyVo1.setExamineStatus(companyVo.getExamineStatus());
+        companyDao.update(companyVo1);
 
         /*更新银行卡表*/
-        /*之后以下需要由companyReqVo.getBankList()改为res.getBankList()*/
-        List<CompanyBankReqVo> companyBankReqVoList = companyReqVo.getBankList();
+        List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
         if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()) {
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
             CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
@@ -471,7 +468,7 @@ public class CompanyServiceImpl implements CompanyService {
         }
 
         /*此处需要调用第三方接口发送手机验证码，并修改数据库状态*/
-        /*CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
         ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
         ResponseResult result = payFeign.bindBack(companyBankReqVo);
         if (null == result || !"00".equals(result.getCode())){
@@ -481,7 +478,7 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
         ObjectHelper.writeWithFrom(companyBankCardVo,resVo);
         companyBankCardVo.setIsDefault(reqVo.getIsDefault());
-        companyBankCardDao.update(companyBankCardVo);*/
+        companyBankCardDao.update(companyBankCardVo);
         return reqVo.getId();
     }
 
@@ -497,10 +494,10 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyBankCardVo bankCardVo = companyBankCardDao.load(reqVo, CompanyBankCardVo.class);
         CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
         ObjectHelper.writeWithFrom(companyBankReqVo, bankCardVo);
-        /*ResponseResult result = payFeign.unbindBankCard(companyBankReqVo);
+        ResponseResult result = payFeign.unbindBankCard(companyBankReqVo);
         if (null == result || !"00".equals(result.getCode())){
             throw new CodeException("解绑失败，请重试");
-        }*/
+        }
         /*若删除的银行卡为默认银行卡，则需要设置其他一张卡为默认银行卡*/
         if (CompanyBankCardConstant.IS_DEFAULT.equals(bankCardVo.getIsDefault())) {
             CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
@@ -550,7 +547,7 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
 
         /*此处应该将companyBankCardVo和verifyCode发送到第三方接口，获取到的返回值用于更新银行卡状态*/
-        /*CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
         ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
         companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
         ResponseResult result = payFeign.bindBack(companyBankReqVo);
@@ -561,10 +558,9 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyBankCardVo companyBankCardVo1 = new CompanyBankCardVo();
         ObjectHelper.writeWithFrom(companyBankCardVo1,resVo);
         companyBankCardVo1.setIsDefault(companyBankCardVo.getIsDefault());
-        companyBankCardDao.update(companyBankCardVo1);*/
+        companyBankCardDao.update(companyBankCardVo1);
 
-        /*return companyBankCardVo1;*/
-        return companyBankCardVo;
+        return companyBankCardVo1;
     }
 
     /**

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

@@ -171,7 +171,7 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
         companyGetReqVo.setId(reqVo.getId());
         CompanyVo company = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
-        /*CompanyReqVo companyReqVo = new CompanyReqVo();
+        CompanyReqVo companyReqVo = new CompanyReqVo();
         ObjectHelper.writeWithFrom(companyReqVo,reqVo);
         companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
         companyReqVo.setStatus(company.getStatus());
@@ -181,12 +181,9 @@ public class RegisterServiceImpl implements RegisterService {
         }
         CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
 
-        *//*更新公司表*//*
-        CompanyVo companyVo = new CompanyVo();
-        ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);*/
-        /*以上内容先不调用,调用后，下面两行代码需要删掉*/
+        /*更新公司表*/
         CompanyVo companyVo = new CompanyVo();
-        ObjectHelper.writeWithFrom(companyVo,company);
+        ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         companyDaoImpl.update(companyVo);