heart-work:发布活动、保存活动草稿接口暂存1

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java

@@ -3,6 +3,7 @@ package com.epmet.resi.partymember.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
@@ -73,4 +74,14 @@ public interface ResiPartyMemberOpenFeignClient {
      **/
     @PostMapping(value = "/resi/partymember/partymemberbaseinfo/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
+     * @param userIdList
+     * @author yinzuomei
+     * @description 根据用户id查询认证通过的党员信息
+     * @Date 2020/7/22 12:14
+     **/
+    @PostMapping(value = "/resi/partymember/partymemberinfo/queryPartymemberInfoByUserId", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<PartymemberInfoDTO>> queryPartymemberInfoByUserId(@RequestBody List<String> userIdList);
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
@@ -46,4 +47,18 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     public Result deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "deltePartyMemberBaseInfo", formDTO);
     }
+
+    /**
+     * @param userIdList
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
+     * @author yinzuomei
+     * @description 根据用户id查询认证通过的党员信息
+     * @Date 2020/7/22 12:14
+     **/
+    @Override
+    public Result<List<PartymemberInfoDTO>> queryPartymemberInfoByUserId(List<String> userIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryPartymemberInfoByUserId", userIdList);
+    }
+
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java

@@ -132,4 +132,16 @@ public class PartymemberInfoController {
         return new Result<List<PartyAuthProcessingCountResultDTO>>().ok(list);
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>
+     * @param userIdList
+     * @author yinzuomei
+     * @description 根据用户id查询认证通过的党员信息
+     * @Date 2020/7/22 12:18
+     **/
+    @PostMapping(value = "queryPartymemberInfoByUserId")
+    Result<List<PartymemberInfoDTO>> queryPartymemberInfoByUserId(@RequestBody List<String> userIdList) {
+        List<PartymemberInfoDTO> list = partymemberInfoService.queryPartymemberInfoByUserId(userIdList);
+        return new Result<List<PartymemberInfoDTO>>().ok(list);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java

@@ -67,4 +67,12 @@ public interface PartymemberInfoDao extends BaseDao<PartymemberInfoEntity> {
 	 */
 	CertifiedDetailResultDTO certifiedDetail(CertifiedDetailFormDTO formDTO);
 
+	/**
+	 * @return com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO
+	 * @param userId
+	 * @author yinzuomei
+	 * @description 根据用户id查询认证通过的党员信息,此sql用来初始化user_base_info用
+	 * @Date 2020/7/22 12:19
+	 **/
+    PartymemberInfoDTO queryPartymemberInfoByUserId(String userId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java

@@ -19,7 +19,6 @@ package com.epmet.modules.partymember.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@@ -27,7 +26,6 @@ import com.epmet.resi.partymember.dto.partymember.form.CertifiedDetailFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.CertifiedDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -146,4 +144,13 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
      * @Date 2020/5/13 22:37
      **/
     List<PartyAuthProcessingCountResultDTO> queryPartyMemberProcessingCount(List<String> gridIdList);
+
+    /**
+     * @return com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO
+     * @param userIdList
+     * @author yinzuomei
+     * @description 根据用户id查询认证通过的党员信息
+     * @Date 2020/7/22 12:18
+     **/
+    List<PartymemberInfoDTO> queryPartymemberInfoByUserId(List<String> userIdList);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@@ -219,5 +219,27 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		return list;
 	}
 
+	/**
+	 * @param userIdList
+	 * @return com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO
+	 * @author yinzuomei
+	 * @description 根据用户id查询认证通过的党员信息
+	 * @Date 2020/7/22 12:18
+	 **/
+	@Override
+	public List<PartymemberInfoDTO> queryPartymemberInfoByUserId(List<String> userIdList) {
+		if(null==userIdList||userIdList.size()<1){
+			return new ArrayList<>();
+		}
+		List<PartymemberInfoDTO> list=new ArrayList<>();
+		for(String userId:userIdList){
+			PartymemberInfoDTO partymemberInfoDTO=baseDao.queryPartymemberInfoByUserId(userId);
+			if(null!=partymemberInfoDTO){
+				list.add(partymemberInfoDTO);
+			}
+		}
+		return list;
+	}
+
 
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -103,4 +103,17 @@
             AND pi.confirm_result IN ( 'auto_confirm_success', 'approved' )
     </select>
 
+    <!--  根据用户id查询认证通过的党员信息  -->
+    <select id="queryPartymemberInfoByUserId" parameterType="java.lang.String" resultType="com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO">
+        SELECT
+            *
+        FROM
+            partymember_info pi
+        WHERE
+            pi.DEL_FLAG = '0'
+            AND ( pi.CONFIRM_RESULT = 'auto_confirm_success' OR pi.CONFIRM_RESULT = 'approved' )
+            AND pi.USER_ID = #{userId}
+            order by pi.CREATED_TIME desc
+            limit 1
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -21,8 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dao.UserWechatDao;
@@ -33,6 +35,8 @@ import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserWechatResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.redis.UserBaseInfoRedis;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.UserBaseInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +63,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     private UserWechatDao userWechatDao;
     @Autowired
     private UserResiInfoDao userResiInfoDao;
+    @Autowired
+    private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
 
     @Override
     public PageData<UserBaseInfoDTO> page(Map<String, Object> params) {
@@ -145,6 +151,15 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     @Override
     public void initBaseInfo() {
         List<UserWechatDTO> userWechatDTOList=userWechatDao.selectAll();
+        List<String> userIdList=new ArrayList<>();
+        for(UserWechatDTO userWechatDTO:userWechatDTOList){
+            userIdList.add(userWechatDTO.getUserId());
+        }
+        Result<List<PartymemberInfoDTO>> partymemberInfoDTOResult=resiPartyMemberOpenFeignClient.queryPartymemberInfoByUserId(userIdList);
+        List<PartymemberInfoDTO> list=new ArrayList<>();
+        if(partymemberInfoDTOResult.success()&&null!=partymemberInfoDTOResult.getData()&&partymemberInfoDTOResult.getData().size()>0){
+            list=partymemberInfoDTOResult.getData();
+        }
         for(UserWechatDTO userWechatDTO:userWechatDTOList){
             UserResiInfoDTO userResiInfoDTO=userResiInfoDao.selectByUserId(userWechatDTO.getUserId());
             UserBaseInfoEntity userBaseInfoEntity=new UserBaseInfoEntity();
@@ -154,8 +169,14 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             userBaseInfoEntity.setSurname(userResiInfoDTO.getSurname());
             userBaseInfoEntity.setName(userResiInfoDTO.getName());
             userBaseInfoEntity.setRealName(userResiInfoDTO.getSurname()+userResiInfoDTO.getName());
+            userBaseInfoEntity.setIdNum(NumConstant.EMPTY_STR);
             //查询党员信息
-//            userBaseInfoEntity.setIdNum();
+             for(PartymemberInfoDTO partymemberInfo:list){
+                 if(userBaseInfoEntity.getUserId().equals(partymemberInfo.getUserId())){
+                     userBaseInfoEntity.setIdNum(partymemberInfo.getIdCard());
+                     break;
+                 }
+             }
             userBaseInfoEntity.setGender(userWechatDTO.getSex().toString());
             userBaseInfoEntity.setStreet(userResiInfoDTO.getStreet());
             userBaseInfoEntity.setDistrict(userResiInfoDTO.getDistrict());