Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdWxController.java

@@ -191,13 +191,17 @@ public class PeasantHouseholdWxController extends BaseController {
     public ResponseModel<PeasantHouseholdWxDto> wxUserRegister(@ApiParam @RequestBody MobileLoginParamDto mobileLoginParam) {
         PeasantHousehold peasantHousehold = new PeasantHousehold();
         try {
-            //注册并登录 生成农户信息表数据
-            PeasantHouseholdWxDto peasantHouseholdWxDto = peasantHouseholdServiceImpl.registerAndLogin(mobileLoginParam);
-            peasantHousehold = peasantHouseholdWxDto.getPeasantHousehold();
             log.info("微信农户注册, 入参 => {}", mobileLoginParam);
             PeasantHouseholdDto model = mobileLoginParam.getPeasantHouseholdDto();
             validatedPeasantHouseholdDto(model);
+            
+            log.info("校验通过生成平台账号");
+            //注册并登录 生成农户信息表数据
+            PeasantHouseholdWxDto peasantHouseholdWxDto = peasantHouseholdServiceImpl.registerAndLogin(mobileLoginParam);
+            peasantHousehold = peasantHouseholdWxDto.getPeasantHousehold();
+            
             BeanDtoUtils.copyPropertiesAllNonNull(peasantHousehold, model);
+            log.info("生成农户属性");
             model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo(model.getRegionalCompaniesSeq()));
             model.setIsCertified(1);// 这里就实名认证
             model.setSurveyOrNot(0);
@@ -232,11 +236,13 @@ public class PeasantHouseholdWxController extends BaseController {
                     }
                 }
             }
+            log.info("更新农户信息");
             BeanDtoUtils.copyPropertiesAllNonNull(model, peasantHousehold);
             PeasantHouseholdDto result = peasantHouseholdServiceImpl.savePeasantHousehold(model, null);
             peasantHouseholdWxDto.setPeasantHousehold(peasantHousehold);
             return ResponseHelper.buildResponse(peasantHouseholdWxDto);
         } catch (Exception e) {
+        	e.printStackTrace();
             log.error(e.getMessage());
             if (null != peasantHousehold) {
                 log.error("调用平台接口回滚注册的用户 => {}", e, peasantHousehold.getAmosUserId());