1、解决用户类型不对问题

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/service/UserServiceImpl.java

@@ -17,6 +17,7 @@ import com.citu.module.menduner.im.service.wukong.WuKongUserService;
 import com.citu.module.menduner.system.api.user.UserApi;
 import com.citu.module.menduner.system.api.user.UserInfoReqDTO;
 import com.citu.module.menduner.system.api.user.UserInfoRespDTO;
+import com.citu.module.menduner.system.enums.MdeUserTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -119,7 +120,7 @@ public class UserServiceImpl implements UserService{
             item.setUserId(userDO.getUserId());
 
             item.setUserType(DEFAULT_ENTERPRISE_ID.equals(userDO.getEnterpriseId())
-                    ?UserInfoReqDTO.USER_TYPE_USER:UserInfoReqDTO.USER_TYPE_ENTERPRISE);
+                    ? MdeUserTypeEnum.USER.getType():MdeUserTypeEnum.ENTERPRISE_USER.getType());
 
             item.setEnterpriseId(DEFAULT_ENTERPRISE_ID.equals(userDO.getEnterpriseId())?null:userDO.getEnterpriseId());
             list.add(item);

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/MdeUserTypeEnum.java

@@ -9,10 +9,10 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum MdeUserTypeEnum {
-    USER("0", "求职端用户"),
-    ENTERPRISE_USER("1", "企业端用户")
+    USER(0, "求职端用户"),
+    ENTERPRISE_USER(1, "企业端用户")
     ;
 
-    private final String type;
+    private final Integer type;
     private final String name;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/api/user/UserApiImpl.java

@@ -29,7 +29,7 @@ public class UserApiImpl implements UserApi {
         List<UserInfoRespDTO> list = new ArrayList<>();
         for (UserInfoReqDTO dto : req) {
             UserInfoRespDTO respDTO = new UserInfoRespDTO();
-            if (Integer.parseInt(MdeUserTypeEnum.USER.getType()) == dto.getUserType()) {
+            if (MdeUserTypeEnum.USER.getType() == dto.getUserType()) {
                 // 平台用户
                 PersonInfoDO personInfo = personMapper.selectOne(PersonInfoDO::getUserId, dto.getUserId());
                 if (null != personInfo) {
@@ -40,7 +40,7 @@ public class UserApiImpl implements UserApi {
                 }
 
             }
-            if (Integer.parseInt(MdeUserTypeEnum.ENTERPRISE_USER.getType()) == dto.getUserType()) {
+            if (MdeUserTypeEnum.ENTERPRISE_USER.getType() == dto.getUserType()) {
                 // 企业用户
                 UserInfoRespDTO info = bindMapper.selectUserInfo(dto.getEnterpriseId(), dto.getUserId());
                 if (null != info) {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/order/TradeOrderServiceImpl.java

@@ -335,7 +335,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
 
     @Override
     public PageResult<AppRecruitTradeOrderRespVO> page(AppRecruitTradeOrderPageReqVO reqVO) {
-        reqVO.setUserType(MdeUserTypeEnum.ENTERPRISE_USER.getType());
+        reqVO.setUserType(String.valueOf(MdeUserTypeEnum.ENTERPRISE_USER.getType()));
         reqVO.setEnterpriseId(LoginUserContext.getEnterpriseId());
         reqVO.setUserId(LoginUserContext.getUserId());
         return tradeOrderMapper.page(reqVO);
@@ -346,7 +346,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         // 获取待支付的订单
         TradeOrderTypeEnum type = TradeOrderTypeEnum.getByType(reqVO.getType());
         TradeOrderCreateReqVO dto = new TradeOrderCreateReqVO();
-        dto.setUserType(MdeUserTypeEnum.ENTERPRISE_USER.getType());
+        dto.setUserType(String.valueOf(MdeUserTypeEnum.ENTERPRISE_USER.getType()));
         dto.setEnterpriseId(LoginUserContext.getEnterpriseId());
         dto.setUserId(LoginUserContext.getUserId());
         dto.setType(reqVO.getType());

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/userapi/UserApiTest.java

@@ -24,14 +24,14 @@ public class UserApiTest extends BaseMockitoUnitTest {
         List<UserInfoReqDTO> list = new ArrayList<>();
         UserInfoReqDTO userInfoReqDTO1 = new UserInfoReqDTO();
         userInfoReqDTO1.setUserId(1L);
-        userInfoReqDTO1.setUserType(Integer.parseInt(MdeUserTypeEnum.USER.getType()));
+        userInfoReqDTO1.setUserType(MdeUserTypeEnum.USER.getType());
 
         list.add(userInfoReqDTO1);
 
         UserInfoReqDTO userInfoReqDTO2 = new UserInfoReqDTO();
         userInfoReqDTO2.setUserId(1L);
         userInfoReqDTO2.setEnterpriseId(1L);
-        userInfoReqDTO2.setUserType(Integer.parseInt(MdeUserTypeEnum.ENTERPRISE_USER.getType()));
+        userInfoReqDTO2.setUserType(MdeUserTypeEnum.ENTERPRISE_USER.getType());
 
         list.add(userInfoReqDTO2);