user/role/tright 8.7

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

@@ -544,12 +544,11 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyGetReqVo getReqVo = new CompanyGetReqVo();
         getReqVo.setId(reqVo.getId());
         CompanyVo companyVo = companyDaoImpl.load(getReqVo,CompanyVo.class);
-        System.out.println("companyAttribute:"+companyVo.getCompanyAttribute());
         /*此处应该将companyVo和verifyCode发送到第三方接口，返回的数据用于更新公司信息*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
         ObjectHelper.writeWithFrom(companyReqVo,companyVo);
         companyReqVo.setValidateCode(reqVo.getVerifyCode());
-        companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
+        companyReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
         ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())){
             throw new CodeException("保存商户失败，请重试");
@@ -560,7 +559,7 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyVo companyVo1 = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
         companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
-        companyVo1.setCompanyAttribute(reqVo.getCompanyAttribute());
+        companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
         companyVo1.setExamineStatus(0);
         companyDaoImpl.update(companyVo1);
         return reqVo.getVerifyCode();
@@ -576,7 +575,6 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyGetReqVo getReqVo = new CompanyGetReqVo();
         getReqVo.setId(reqVo.getId());
         CompanyVo companyVo = companyDaoImpl.load(getReqVo,CompanyVo.class);
-        System.out.println("companyAttribute:"+companyVo.getCompanyAttribute());
         /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
         ObjectHelper.writeWithFrom(companyReqVo,companyVo);
@@ -609,7 +607,7 @@ public class RegisterServiceImpl implements RegisterService {
         ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
         companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
         companyVo1.setExamineStatus(0);
-        companyVo1.setCompanyAttribute(reqVo.getCompanyAttribute());
+        companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
         companyDaoImpl.update(companyVo1);
 
         List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();