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

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

@@ -176,6 +176,7 @@ public class RegisterServiceImpl implements RegisterService {
         companyVo.setExamineStatus(0);
         companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
         companyDaoImpl.update(companyVo);
+        System.out.println("companyAttribute:"+companyVo.getCompanyAttribute());
 
         /*跟新用户表添加联系方式*/
         UserVo userReqVo = new UserVo();
@@ -253,6 +254,7 @@ public class RegisterServiceImpl implements RegisterService {
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         companyVo.setExamineStatus(0);
         companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
+        System.out.println("companyAttribute:"+companyVo.getCompanyAttribute());
         companyDaoImpl.update(companyVo);
 
         List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
@@ -546,7 +548,7 @@ public class RegisterServiceImpl implements RegisterService {
         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("保存商户失败，请重试");
@@ -557,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();
@@ -605,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();