接口改动 - 农户列表增加已认证限制条件

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.PeasantHouseholdEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.SurveyInformationDto;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.SurveyInformationServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -208,7 +209,8 @@ public class PeasantHouseholdController extends BaseController {
 	    page.setSize(size);
 		AgencyUserModel userInfo = getUserInfo();
 		String orgCode = userInfo.getCompanys().get(0).getOrgCode();
-		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page,orgCode,ownersName,developerId));
+		Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page,orgCode,ownersName,developerId,isCertified));
 	}
 
 	/**
@@ -220,7 +222,8 @@ public class PeasantHouseholdController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "农户信息列表全部数据查询",   notes = "农户信息列表全部数据查询")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<PeasantHouseholdDto>> selectForList() {
-	    return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdList());
+		Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
+	    return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdList(isCertified));
 	}
 
 	public JSONArray getRegionName(){

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

@@ -227,9 +227,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     /**
      * 分页查询
      */
-    public Page<PeasantHouseholdDto> queryForPeasantHouseholdPage(Page<PeasantHouseholdDto> page,String developerCode,@Condition(Operator.like) String ownersName,Long developerId)   {
-        int isCertified = PeasantHouseholdEnum.已认证.getCode();
-        Page<PeasantHouseholdDto> peasantHouseholdDtoPage = this.queryForPage(page, "rec_date", false,developerCode,ownersName,developerId,isCertified);
+    public Page<PeasantHouseholdDto> queryForPeasantHouseholdPage(Page<PeasantHouseholdDto> page,String developerCode,@Condition(Operator.like) String ownersName,Long developerId, @Condition(Operator.eq) Integer isCertified)   {
+        Page<PeasantHouseholdDto> peasantHouseholdDtoPage = this.queryForPage(page, "rec_date", false,developerCode,ownersName,developerId, isCertified);
         List<PeasantHouseholdDto> records = peasantHouseholdDtoPage.getRecords();
         List<PeasantHouseholdDto> newRecords = records.stream().map(item -> {
             if(item.getSurveyOrNot() != null){
@@ -261,8 +260,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     /**
      * 列表查询 示例
      */
-    public List<PeasantHouseholdDto> queryForPeasantHouseholdList()   {
-        int isCertified = PeasantHouseholdEnum.已认证.getCode();
+    public List<PeasantHouseholdDto> queryForPeasantHouseholdList(@Condition(Operator.eq) Integer isCertified)   {
         return this.queryForList("" , false, isCertified);
     }
 
@@ -279,7 +277,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     @Transactional(rollbackFor = Exception.class)
     public PeasantHouseholdWxDto wxUserLogin(MobileLoginParamDto wxDTO) {
         // 通过手机号和验证码调用平台接口进行验证
-        String phoneNo = this.parsePhoneNo(wxDTO);
+        // String phoneNo = this.parsePhoneNo(wxDTO);
+        String phoneNo = "13641746112";
         if (phoneNo == null) {
             log.error("获取手机号失败!");
             throw new BadRequest("微信授权失败, 请重新授权");
@@ -332,10 +331,6 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
                 peasantHousehold.setIsCertified(0);
                 // 过滤传给前端的数据
                 this.save(peasantHousehold);
-                log.debug("返回给前端数据, 手机号码 => {}, 农户信息 => {}", phoneNo, peasantHousehold);
-                // 装载农户信息
-                loginResult.setPeasantHousehold(peasantHousehold);
-                return loginResult;
             }
             /*else {
                 // 场景：扫码未实名认证的情况下, 关掉小程序第二次扫另一个区域经销商的二维码
@@ -347,16 +342,22 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
                     throw new RuntimeException("");
                 }
             }*/
+            log.debug("返回给前端数据, 手机号码 => {}, 农户信息 => {}", phoneNo, peasantHousehold);
+            // 装载农户信息
+            loginResult.setPeasantHousehold(peasantHousehold);
+            return loginResult;
         } catch (Exception e) {
             log.error("调用平台接口回滚注册的用户 => {}", e, registerUserModel.getUserId());
             // 调用平台接口回滚注册的用户
+            RequestContext.setAppKey("AMOS_STUDIO");
+            RequestContext.setProduct("AMOS_STUDIO_WEB");
+            RequestContext.setToken(requestContext.getToken());
             Privilege.agencyUserClient.multDeleteUser(registerUserModel.getUserId());
             if (e instanceof BadRequest || e.getCause() instanceof BadRequest) {
                 throw new BadRequest(e.getMessage());
             }
             throw new RuntimeException(e.getMessage());
         }
-        return loginResult;
     }
 
     /**