用户注册与登录接口

esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/CpUserDetailRedis.java

@@ -79,4 +79,16 @@ public class CpUserDetailRedis {
     public boolean expire(String userId, long expire) {
         return redisUtils.expire(RedisKeys.getCpUserKey(userId), expire);
     }
+
+    /**
+     * 查询token剩余时间
+     *
+     * @param userId
+     * @return long
+     * @author yujintao
+     * @date 2019/9/9 14:18
+     */
+    public long getExpire(String userId) {
+        return redisUtils.getExpire(RedisKeys.getCpUserKey(userId));
+    }
 }

esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/TokenUtil.java

@@ -33,7 +33,19 @@ public class TokenUtil {
         redisUtils.logout(userId);
     }
 
-    public boolean delayToken(String token) {
-        return redisUtils.expire(token, tokenPropertise.getExpire());
+    public boolean delayToken(String userId) {
+        return redisUtils.expire(userId, tokenPropertise.getExpire());
+    }
+
+    /**
+     * 获取token过期时间
+     *
+     * @param userId
+     * @return long
+     * @author yujintao
+     * @date 2019/9/9 14:19
+     */
+    public long getExpire(String userId) {
+        return redisUtils.getExpire(userId);
     }
 }

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java

@@ -60,11 +60,6 @@ public interface Constant {
      */
     String CREATE_DATE = "create_date";
 
-    /**
-     * 创建时间字段名
-     */
-    String CREATED_TIME = "created_time";
-
     /**
      * 数据权限过滤
      */

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java

@@ -33,4 +33,22 @@ public interface FieldConstant {
 
     String NAME = "NAME";
     String NAME_HUMP = "name";
+
+    String MOBILE = "MOBILE";
+    String MOBILE_HUMP = "mobile";
+
+    String STATE = "STATE";
+    String STATE_HUMP = "state";
+
+    String STREET_ID = "STREET_ID";
+    String STREET_ID_HUMP = "streetId";
+
+    String COMMUNITY_ID = "COMMUNITY_ID";
+    String COMMUNITY_ID_HUMP = "communityId";
+
+    String GRID_ID = "GRID_ID";
+    String GRID_ID_HUMP = "gridId";
+
+
+
 }

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisUtils.java

@@ -134,6 +134,10 @@ public class RedisUtils {
         return redisTemplate.expire(key, expire, TimeUnit.SECONDS);
     }
 
+    public long getExpire(String key) {
+        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
+    }
+
     public void hDel(String key, Object... fields) {
         redisTemplate.opsForHash().delete(key, fields);
     }

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserTokenFormDTO.java

@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 用户登录，获取token
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/9 10:48
+ */
+@Data
+public class EpdcAppUserTokenFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5143037207300507252L;
+
+    /**
+     * 微信code
+     */
+    @NotBlank(message = "微信code不能为空")
+    private String wxCode;
+}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 授权信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+public class EpdcAppAuthorizationDTO implements Serializable {
+
+    private static final long serialVersionUID = 3908231797102233188L;
+
+    /**
+     * 令牌
+     */
+    private String token;
+    /**
+     * token超时时间，秒
+     */
+    private Long expire;
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 用户状态[AppUserStateEnum]
+     */
+    private String userState;
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -3,12 +3,11 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 用户模块
@@ -24,9 +23,31 @@ public class ApiAppUserController {
     @Autowired
     private AppUserService appUserService;
 
+    /**
+     * 用户注册
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/9 10:41
+     */
     @PostMapping("user/regist")
-    public Result userRegist(@RequestBody EpdcUserRegistFormDTO formDto){
+    public Result userRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.userRegist(formDto);
     }
+
+    /**
+     * 用户登录，获取token
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO>
+     * @author yujintao
+     * @date 2019/9/9 10:52
+     */
+    @GetMapping("user/getToken")
+    public Result<EpdcAppAuthorizationDTO> getToken(@RequestBody EpdcAppUserTokenFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return appUserService.getToken(formDto);
+    }
 }

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

@@ -2,6 +2,8 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 
 /**
  * @author yujintao
@@ -19,4 +21,14 @@ public interface AppUserService {
      * @date 2019/9/7 09:54
      */
     Result userRegist(EpdcUserRegistFormDTO formDto);
+
+    /**
+     * 用户登录，获取token
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO>
+     * @author yujintao
+     * @date 2019/9/9 10:52
+     */
+    Result<EpdcAppAuthorizationDTO> getToken(EpdcAppUserTokenFormDTO formDto);
 }

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

@@ -1,5 +1,9 @@
 package com.elink.esua.epdc.service.impl;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.common.token.property.TokenPropertise;
+import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
+import com.elink.esua.epdc.common.token.util.TokenUtil;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -7,11 +11,16 @@ import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum;
 import com.elink.esua.epdc.enums.AppUserRegisterWayEnum;
+import com.elink.esua.epdc.enums.AppUserStateEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
+import com.elink.esua.epdc.jwt.JwtTokenProperties;
+import com.elink.esua.epdc.jwt.JwtTokenUtils;
 import com.elink.esua.epdc.redis.AppUserRedis;
 import com.elink.esua.epdc.service.AppUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +48,9 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private AppUserRedis appUserRedis;
 
+    @Autowired
+    private CpUserDetailRedis cpUserDetailRedis;
+
     @Autowired
     private WxMpService wxMpService;
 
@@ -48,6 +60,75 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private UserFeignClient userFeignClient;
 
+    @Autowired
+    private TokenUtil tokenUtil;
+
+    @Autowired
+    private JwtTokenProperties jwtTokenProperties;
+
+    @Autowired
+    private JwtTokenUtils jwtTokenUtils;
+
+
+    @Override
+    public Result<EpdcAppAuthorizationDTO> getToken(EpdcAppUserTokenFormDTO formDto) {
+
+        WxMpOAuth2AccessToken wxMpOAuth2AccessToken;
+        try {
+            wxMpOAuth2AccessToken = wxMpService.oauth2getAccessToken(formDto.getWxCode());
+        } catch (WxErrorException e) {
+            log.error("->[getToken]::error[{}]", "解析微信code失败");
+            return new Result().error("解析微信code失败");
+        }
+        // 查询当前微信是否已注册用户
+        Result<UserDTO> userInfoResult = userFeignClient.getUserInfoByOpenId(wxMpOAuth2AccessToken.getOpenId());
+        if (!userInfoResult.success()) {
+            return new Result().error("查询用户信息失败");
+        }
+
+        UserDTO userDto = userInfoResult.getData();
+        EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO();
+        // 用户未注册
+        if (null == userDto) {
+            authorization.setUserState(AppUserStateEnum.UNREGISTERED.value());
+            return new Result().ok(authorization);
+        }
+        String state = userDto.getState();
+        String userId = userDto.getId();
+        TokenDto tokenInfo = tokenUtil.getTokenInfo(userId);
+
+        // 用户已注册且审核通过，可以正常登录系统
+        if (AppUserAuditStateEnum.AUDIT_SUCCESS.value().equals(state)) {
+            // 生成token
+            String token = jwtTokenUtils.generateToken(userId);
+            Long expire;
+            // 用户已登录过，且用户缓存信息未超时
+            if (null != tokenInfo) {
+                tokenUtil.delayToken(userId);
+                expire = tokenUtil.getExpire(userId);
+            } else {
+                expire = (long) jwtTokenProperties.getExpire();
+            }
+
+            TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class);
+            tokenDto.setUserId(userId);
+            cpUserDetailRedis.set(tokenDto, expire);
+
+            authorization.setUserState(AppUserStateEnum.REGISTERED.value());
+            authorization.setToken(token);
+            authorization.setUserId(userId);
+            authorization.setExpire(expire);
+            return new Result().ok(authorization);
+        }
+
+        // 用户提交注册、正在等待审核或审核失败
+        if (AppUserAuditStateEnum.UNDER_AUDIT.value().equals(state)) {
+            authorization.setUserState(AppUserStateEnum.UNDER_AUDIT.value());
+        } else if (AppUserAuditStateEnum.AUDIT_FAILURE.value().equals(state)) {
+            authorization.setUserState(AppUserStateEnum.AUDIT_FAILURE.value());
+        }
+        return new Result().ok(authorization);
+    }
 
     @Override
     public Result userRegist(EpdcUserRegistFormDTO formDto) {
@@ -116,6 +197,8 @@ public class AppUserServiceImpl implements AppUserService {
                         .concat(NumConstant.ZERO_STR.equals(user.getSex()) ? "女士" : "先生")
         );
 
+        user.setDistrict(completeDept.getDistrict());
+        user.setDistrictId(completeDept.getDistrictId());
         user.setStreet(completeDept.getStreet());
         user.setStreetId(completeDept.getStreetId());
         user.setCommunity(completeDept.getCommunity());
@@ -126,11 +209,13 @@ public class AppUserServiceImpl implements AppUserService {
         String address = formDto.getRoad()
                 .concat(StringUtils.isNotBlank(formDto.getVillageName()) ? formDto.getVillageName() : "")
                 .concat(StringUtils.isNotBlank(formDto.getBuildingCode()) ? formDto.getBuildingCode().concat("号楼") : "")
-                .concat(StringUtils.isNotBlank(formDto.getUnitCode()) ? formDto.getUnitCode().concat("单元") : "");
-
+                .concat(StringUtils.isNotBlank(formDto.getUnitCode()) ? formDto.getUnitCode().concat("单元") : "")
+                .concat(StringUtils.isNotBlank(formDto.getHouseCode()) ? formDto.getHouseCode() : "");
         user.setAddress(address);
+
         user.setWxOpenId(wxMpUser.getOpenId());
         user.setFaceImg(wxMpUser.getHeadImgUrl());
+
         user.setRegisterTime(new Date());
         user.setState(AppUserAuditStateEnum.UNDER_AUDIT.value());
         user.setPartyFlag(YesOrNoEnum.NO.value());

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml

@@ -96,3 +96,9 @@ wx:
 
 token:
   expire: 21600
+
+jwt:
+  #秘钥
+  secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epdc]
+  #token有效时长，默认7天，单位秒
+  expire: 604800

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java

@@ -155,6 +155,11 @@ public class UserDTO implements Serializable {
      */
     private String buildingCode;
 
+    /**
+     * 所在门牌号
+     */
+    private String houseCode;
+
     /**
      * 所在单元号
      */
@@ -215,6 +220,16 @@ public class UserDTO implements Serializable {
      */
     private String state;
 
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 区县ID
+     */
+    private Long districtId;
+
     /**
      * 街道
      */

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java

@@ -50,18 +50,19 @@ public class EpdcUserRegistFormDTO implements Serializable {
     /**
      * 小区名
      */
-    @NotBlank(message = "小区名不能为空")
     private String villageName;
     /**
      * 楼栋号
      */
-    @NotBlank(message = "楼栋号不能为空")
     private String buildingCode;
     /**
      * 单元号
      */
-    @NotBlank(message = "单元号不能为空")
     private String unitCode;
+    /**
+     * 门牌号
+     */
+    private String houseCode;
     /**
      * 微信code
      */

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java

@@ -158,6 +158,11 @@ public class UserEntity extends BaseEpdcEntity {
      */
     private String unitCode;
 
+    /**
+     * 所在门牌号
+     */
+    private String houseCode;
+
     /**
      * 居民住址
      */
@@ -213,6 +218,16 @@ public class UserEntity extends BaseEpdcEntity {
      */
     private String state;
 
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 区县ID
+     */
+    private Long districtId;
+
     /**
      * 街道
      */

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

@@ -19,13 +19,11 @@ package com.elink.esua.epdc.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -62,7 +60,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     @Override
     public PageData<PartyMembersDTO> page(Map<String, Object> params) {
         IPage<PartyMembersEntity> page = baseDao.selectPage(
-                getPage(params, Constant.CREATED_TIME, false),
+                getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
 
@@ -88,7 +86,6 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
         QueryWrapper<PartyMembersEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-        //wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
 
         return wrapper;
     }

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

@@ -19,10 +19,8 @@ package com.elink.esua.epdc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-import com.elink.esua.epdc.commons.tools.constant.Constant;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dao.PartyTagRelationDao;
@@ -53,7 +51,7 @@ public class PartyTagRelationServiceImpl extends BaseServiceImpl<PartyTagRelatio
     @Override
     public PageData<PartyTagRelationDTO> page(Map<String, Object> params) {
         IPage<PartyTagRelationEntity> page = baseDao.selectPage(
-                getPage(params, Constant.CREATED_TIME, false),
+                getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
 
@@ -72,7 +70,6 @@ public class PartyTagRelationServiceImpl extends BaseServiceImpl<PartyTagRelatio
 
         QueryWrapper<PartyTagRelationEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-        //wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
 
         return wrapper;
     }
@@ -104,9 +101,6 @@ public class PartyTagRelationServiceImpl extends BaseServiceImpl<PartyTagRelatio
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
         //逻辑删除
-        //logicDelete(ids, PartyTagRelationEntity.class);
-
-        //物理删除
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 

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

@@ -75,28 +75,27 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     private QueryWrapper<UserEntity> getWrapper(Map<String, Object> params) {
         String auditState = (String) params.get("auditState");
-        String id = (String) params.get("id");
-        String streetId = (String) params.get("streetId");
-        String communityId = (String) params.get("communityId");
-        String gridId = (String) params.get("gridId");
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+        String streetId = (String) params.get(FieldConstant.STREET_ID_HUMP);
+        String communityId = (String) params.get(FieldConstant.COMMUNITY_ID_HUMP);
+        String gridId = (String) params.get(FieldConstant.GRID_ID_HUMP);
         String realName = (String) params.get("realName");
-        String mobile = (String) params.get("mobile");
+        String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
         String identityNo = (String) params.get("identityNo");
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
 
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "ID", id);
-        wrapper.eq(StringUtils.isNotBlank(streetId), "STREET_ID", streetId);
-        wrapper.eq(StringUtils.isNotBlank(communityId), "COMMUNITY_ID", communityId);
-        wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId);
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.eq(StringUtils.isNotBlank(streetId), FieldConstant.STREET_ID, streetId);
+        wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId);
+        wrapper.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId);
         wrapper.eq(StringUtils.isNotBlank(realName), "REAL_NAME", realName);
-        wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
+        wrapper.eq(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE, mobile);
         wrapper.eq(StringUtils.isNotBlank(identityNo), "IDENTITY_NO", identityNo);
         wrapper.ge(StringUtils.isNotBlank(startTime), "REGISTER_TIME", startTime);
         wrapper.lt(StringUtils.isNotBlank(endTime), "REGISTER_TIME", endTime);
-        wrapper.eq(StringUtils.isNotBlank(auditState), "STATE", auditState);
-//        wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
+        wrapper.eq(StringUtils.isNotBlank(auditState), FieldConstant.STATE, auditState);
         return wrapper;
     }
 
@@ -133,14 +132,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     public void audit(UserDTO dto) {
         UserEntity entity = ConvertUtils.sourceToTarget(dto, UserEntity.class);
         //是否通过审核
-        if(YesOrNoEnum.YES.value().equals(dto.getPass())){
+        if (YesOrNoEnum.YES.value().equals(dto.getPass())) {
             entity.setState(AppUserAuditStateEnum.AUDIT_SUCCESS.value());
-        }else if (YesOrNoEnum.NO.value().equals(dto.getPass())){
+        } else if (YesOrNoEnum.NO.value().equals(dto.getPass())) {
             entity.setState(AppUserAuditStateEnum.AUDIT_FAILURE.value());
         }
         updateById(entity);
         //判断是否是党员
-        if (YesOrNoEnum.YES.value().equals(dto.getPartyFlag())&&YesOrNoEnum.YES.value().equals(dto.getPass())) {
+        if (YesOrNoEnum.YES.value().equals(dto.getPartyFlag()) && YesOrNoEnum.YES.value().equals(dto.getPass())) {
             PartyMembersDTO partyMembersDTO = ConvertUtils.sourceToTarget(dto, PartyMembersDTO.class);
             partyMembersDTO.setStreetName(dto.getStreet());
             partyMembersDTO.setCommunityName(dto.getCommunity());
@@ -154,7 +153,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     public Result<UserDTO> getUserInfoByOpenId(String openId) {
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("WX_OPEN_ID", openId)
-                .ne("STATE", AppUserAuditStateEnum.AUDIT_FAILURE.value());
+                .ne(FieldConstant.STATE, AppUserAuditStateEnum.AUDIT_FAILURE.value())
+                .select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",
+                        FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG");
         UserEntity userEntity = this.baseDao.selectOne(wrapper);
         if (null != userEntity) {
             UserDTO dto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class);