Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -122,10 +122,11 @@ public class AppUserServiceImpl implements AppUserService {
 
         return this.userFeignClient.saveWxFormId(saveFormId);
     }
+
     /**
      * 创建微信小程序码，并上传到oss
      *
-     * @param formDto   小程序码的参数
+     * @param formDto 小程序码的参数
      * @return java.lang.String 小程序码的下载抵制
      * @author work@yujt.net.cn
      * @date 2019/10/22 10:14
@@ -135,7 +136,7 @@ public class AppUserServiceImpl implements AppUserService {
         File wxaCodeUnlimit;
         try {
             String url = "pages/index/index?gridId=" + formDto.getGridId().toString();
-            url = url+"&inviteUserId=" + formDto.getInviteUserId();
+            url = url + "&inviteUserId=" + formDto.getInviteUserId();
             wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService().createWxaCode(url);
         } catch (WxErrorException e) {
             throw new RenException("请求微信接口失败");
@@ -151,6 +152,7 @@ public class AppUserServiceImpl implements AppUserService {
         }
         return ossResult;
     }
+
     /**
      * File文件转为byte[]
      *
@@ -901,11 +903,16 @@ public class AppUserServiceImpl implements AppUserService {
         }
         String sessionKey = this.getUserSessionKey(formDto.getWxCode());
         WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, formDto.getEncryptedData(), formDto.getIv());
+        if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) {
+            // 标准文案后续修改
+            return new Result().error("微信接口异常");
+        }
         UserDTO userDTO = new UserDTO();
         userDTO.setId(userDetail.getUserId());
         userDTO.setNickname(wxMaUserInfo.getNickName());
         userDTO.setFaceImg(wxMaUserInfo.getAvatarUrl());
         userDTO.setSex(wxMaUserInfo.getGender());
+        userDTO.setWxUnionId(wxMaUserInfo.getUnionId());
         Result updateWxInfoResult = userFeignClient.updateWxInfo(userDTO);
         if (!updateWxInfoResult.success()) {
             return new Result().error("更新用户信息失败");
@@ -947,11 +954,10 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     /**
-     *
      * 用户加入网格党员群
      *
-     * @params [userDto, lordFlag]
      * @return void
+     * @params [userDto, lordFlag]
      * @author liuchuang
      * @since 2019/11/21 10:58
      */
@@ -967,6 +973,7 @@ public class AppUserServiceImpl implements AppUserService {
         formDto.setGridId(userDto.getGridId());
         groupTask.joinGridPartyGroup(formDto);
     }
+
     @Override
     public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
         return userFeignClient.invitationRecord();

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -174,7 +174,7 @@ public class EpdcAppUserController {
     /**
      * 社群添加好友列表
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:22
@@ -226,6 +226,7 @@ public class EpdcAppUserController {
         user.setNickname(userDto.getNickname());
         user.setFaceImg(userDto.getFaceImg());
         user.setSex(userDto.getSex());
+        user.setWxUnionId(userDto.getWxUnionId());
         userService.update(user);
         return new Result();
     }
@@ -313,10 +314,11 @@ public class EpdcAppUserController {
     public Result<Integer> unauthorizedAmount(@RequestBody EpdcUnauthorizedAmountFromDTO fromDto) {
         return userService.getUnauthorizedAmount(fromDto);
     }
+
     /**
      * 获取邀请记录
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:22
@@ -328,11 +330,10 @@ public class EpdcAppUserController {
     }
 
     /**
-     *
      * 获取用户最后一次切换的网格信息
      *
-     * @params [openId]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @params [openId]
      * @author liuchuang
      * @since 2019/12/6 11:01
      */

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -148,5 +148,12 @@ public interface UserDao extends BaseDao<UserEntity> {
      */
     int selectCountUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
 
-
+    /**
+     * @param workUserFromDto
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>
+     * @Author yinzuomei
+     * @Description 获取用户列表：党员认证失败
+     * @Date 2019/12/7 11:23
+     **/
+    List<EpdcWorkUserResultDTO> selectPartyAuthenticationFailedList(EpdcWorkUserFromDTO workUserFromDto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -90,6 +90,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private UserDetailRedis userDetailRedis;
     @Autowired
     private AdminFeignClient adminFeignClient;
+    @Autowired
+    private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         this.verifyParams(params);
@@ -488,9 +490,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result<String>().ok(userEntity.getState());
     }
 
-    @Autowired
-    private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<UserDTO> completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) {
@@ -535,6 +534,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 partyAuthenticationFailedDao.insert(authenticationFailedEntity);
 
                 userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
+                userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否，1-是)  认证失败：0
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
             } else {
                 UpdateWrapper<PartyMembersEntity> partyUpdate = new UpdateWrapper<>();
@@ -543,6 +543,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
                 this.partyMembersDao.update(partyMembersEntity, partyUpdate);
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value());
+                userDto.setPartyFlag(YesOrNoEnum.YES.value());//是否是党员(0-否，1-是)  认证失败：0
             }
             //插入用户认证历史表
             userAuthenticateHistoryEntity.setUserId(userId);
@@ -662,6 +663,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Override
     public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
+//        authenticatedFlag是否已认证 0否 1是
+//        partyFlag 是否党员，0否，1是
         int pageIndex = (workUserFromDto.getPageIndex() - NumConstant.ONE) * workUserFromDto.getPageSize();
         workUserFromDto.setPageIndex(pageIndex);
 
@@ -678,6 +681,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         // 查询认证失败的党员
         if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) {
             state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value();
+            workUserFromDto.setAuthenticatedFlag(state);
+            workUserFromDto.setPartyFlag(YesOrNoEnum.NO.value());
+            List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectPartyAuthenticationFailedList(workUserFromDto);
+            return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
         }
         workUserFromDto.setAuthenticatedFlag(state);
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -317,5 +317,39 @@
         </choose>
     </select>
 
+    <!--  获取用户列表：党员认证失败  -->
+    <select id="selectPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO"
+            resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
+        SELECT
+        u.ID as userId,
+        u.NICKNAME as nickname,
+        u.REGISTER_TIME as registerTime,
+        u.FACE_IMG as faceImg
+        FROM
+        epdc_user_grid_relation ug
+        LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
+        WHERE u.DEL_FLAG = '0'
+        AND ug.DEL_FLAG = '0'
+        <if test="partyFlag ='0' and authenticatedFlag ='2'">
+            and EXISTS(select m.USER_ID
+            from epdc_party_authentication_failed m
+            where m.USER_ID=u.id)
+        </if>
+        <choose>
+            <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
+            <otherwise>
+            <if test="gridIdList!=null and gridIdList.size()>0">
+                AND ug.GRID_ID in
+                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            </otherwise>
+        </choose>
+        GROUP BY
+        u.ID
+        ORDER BY u.CREATED_TIME DESC
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 
 </mapper>