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

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserSexEnum.java

@@ -24,7 +24,22 @@ public enum UserSexEnum {
     /**
      * 女
      */
-    FEMALE("0");
+    FEMALE("0"),
+
+    /**
+     * 男
+     */
+    WX_MALE("1"),
+
+    /**
+     * 女
+     */
+    WX_FEMALE("2"),
+
+    /**
+     * 未知
+     */
+    WX_UNKNOWN_SEX("0");
 
     private String sex;
 

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

@@ -76,6 +76,5 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable {
     /**
      * 居住网格id
      */
-    @NotBlank(message = "居住网格id不能为空")
     private Long gridId;
 }

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.async.GroupTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
@@ -853,6 +854,7 @@ public class AppUserServiceImpl implements AppUserService {
                     }
                 }
             } else {
+                dto.setGridId(result.getData().getDeptId());
                 //用户已完善信息：获取用户alldeptnames 的后两级机构（社区-网格）
                 String allDeptNames = result.getData().getAllDeptNames();
                 if (StringUtils.isNotBlank(allDeptNames)) {
@@ -945,7 +947,15 @@ public class AppUserServiceImpl implements AppUserService {
         userDTO.setId(userDetail.getUserId());
         userDTO.setNickname(wxMaUserInfo.getNickName());
         userDTO.setFaceImg(wxMaUserInfo.getAvatarUrl());
-        userDTO.setSex(wxMaUserInfo.getGender());
+        //微信性别0未知 1:男  2：女 本系统：1男,0女
+        if (UserSexEnum.WX_MALE.sex().equals(wxMaUserInfo.getGender())) {
+            userDTO.setSex(UserSexEnum.MALE.sex());
+        } else if (UserSexEnum.WX_FEMALE.sex().equals(wxMaUserInfo.getGender())) {
+            userDTO.setSex(UserSexEnum.FEMALE.sex());
+        } else {
+            //未知赋值为空
+            userDTO.setSex("");
+        }
         userDTO.setWxUnionId(wxMaUserInfo.getUnionId());
         Result updateWxInfoResult = userFeignClient.updateWxInfo(userDTO);
         if (!updateWxInfoResult.success()) {