优化农户注册

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -158,9 +158,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         log.info("校验通过生成平台账号");
         //注册并登录 生成农户信息表数据
         PeasantHouseholdWxDto peasantHouseholdWxDto = this.registerAndLogin(mobileLoginParam);
-        household = peasantHouseholdWxDto.getPeasantHousehold();
 
-        BeanDtoUtils.copyPropertiesAllNonNull(household, model);
+        BeanDtoUtils.copyPropertiesAllNonNull(peasantHouseholdWxDto.getPeasantHousehold(), model);
         log.info("生成农户属性");
         model.setPeasantHouseholdNo(this.getPeasantHouseholdNo(model.getRegionalCompaniesSeq()));
         model.setIsCertified(1);// 这里就实名认证
@@ -580,7 +579,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             PeasantHousehold peasantHousehold = peasantHouseholds.size() > 0 ? peasantHouseholds.get(0) : null;
             if (null == peasantHousehold) {
                 peasantHousehold = new PeasantHousehold();
-                BeanUtils.copyProperties(peasantHousehold,wxDTO.getPeasantHouseholdDto());
+                BeanUtils.copyProperties(wxDTO.getPeasantHouseholdDto(),peasantHousehold);
                 peasantHousehold.setIsCertified(0);
                 peasantHousehold.setSurveyOrNot(0);
                 peasantHousehold.setReview(0);