登录问题修复 增加是否注册判断

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -393,12 +394,22 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         RequestContext.setToken(requestContext.getToken());
         PeasantHouseholdDto peasantHouseholdDto = this.buildDefaultPeasantHouseholdDto(wxDTO.getAmosUserId(), wxDTO.getQrCodeType(), wxDTO.getPhoneNo());
         String phoneNo = this.parsePhoneNo(wxDTO);
+        Map<String, Object> resultMap = BeanUtil.beanToMap(peasantHouseholdDto);
+        resultMap.put("isRegister",1);
         if (StringUtils.isNotEmpty(phoneNo)){
             peasantHouseholdDto.setTelephone(phoneNo);
+            FeignClientResult<LoginInfoModel> loginInfo = Privilege.agencyUserClient.getLoginInfo(wxDTO.getPhoneNo());
+            List<PeasantHousehold> peasantHouseholds = this.query().eq("telephone", wxDTO.getPhoneNo()).eq("is_certified","1").orderByDesc("rec_date").list();
+
+            if (loginInfo != null && 200 == loginInfo.getStatus()&& null!= loginInfo.getResult()
+                    &&(peasantHouseholds.size()>0 || !CollectionUtil.isNotEmpty(peasantHouseholds))){
+                resultMap.put("isRegister",0);
+            }
         }else {
             peasantHouseholdDto.setTelephone("");
         }
-        return BeanUtil.beanToMap(peasantHouseholdDto);
+
+        return resultMap;
     }
 
     public PeasantHouseholdWxDto registerAndLogin(MobileLoginParamDto wxDTO){