发货单

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

@@ -135,7 +135,10 @@ public class PeasantHouseholdWxController extends BaseController {
         PeasantHouseholdDto model = mobileLoginParam.getPeasantHouseholdDto();
         AgencyUserModel userInfo = getUserInfo();
         model.setUserId(userInfo.getUserId());// 绑定平台userId
-
+        model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo());
+        model.setIsCertified(0);// 未认证
+        model.setSurveyOrNot(0);
+        model.setReview(0);
         JSONArray regionName = getRegionName();
         List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
         // 处理项目地址

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

@@ -270,12 +270,10 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         PeasantHousehold peasantHousehold = peasantHouseholds.size() > 0 ? peasantHouseholds.get(0) : null;
         // 没有注册过农户信息
         if (null == peasantHousehold) {
-            PeasantHouseholdWxDto peasantHouseholdWxDto = new PeasantHouseholdWxDto();
-            PeasantHouseholdDto peasantHouseholdDto = buildDefaultPeasantHouseholdDto(wxDTO.getUserId(), wxDTO.getQrCodeType(), phoneNo);
             peasantHousehold = new PeasantHousehold();
-            BeanUtils.copyProperties(peasantHouseholdDto, peasantHousehold);
-            peasantHouseholdWxDto.setPeasantHousehold(peasantHousehold);
         }
+        PeasantHouseholdDto peasantHouseholdDto = buildDefaultPeasantHouseholdDto(wxDTO.getUserId(), wxDTO.getQrCodeType(), phoneNo);
+        BeanUtils.copyProperties(peasantHouseholdDto, peasantHousehold);
         PeasantHouseholdWxDto loginResult = doLogin(wxDTO);
         // 装载农户信息
         loginResult.setPeasantHousehold(peasantHousehold);
@@ -403,10 +401,10 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         String regionalCompaniesName = unitInfos.get(0).getRegionalCompaniesName();
 
         PeasantHouseholdDto dto = new PeasantHouseholdDto();
-        dto.setPeasantHouseholdNo(this.getPeasantHouseholdNo());
+        /*dto.setPeasantHouseholdNo(this.getPeasantHouseholdNo());
         dto.setIsCertified(0);// 未认证
         dto.setSurveyOrNot(0);
-        dto.setReview(0);
+        dto.setReview(0);*/
         // 先在后台创建一个角色和公司，微信农户新建的用户使用统一的
         // 用户光伏-微信农户
         // 非扫码进入注册页面，默认