feat: 个人信息接口修改

mini-app/src/main/java/com/onsiteservice/miniapp/controller/user/convert/UserConvert.java

@@ -3,10 +3,13 @@ package com.onsiteservice.miniapp.controller.user.convert;
 import com.onsiteservice.entity.user.User;
 import com.onsiteservice.miniapp.controller.user.vo.UserInfoVO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
 
 @Mapper(componentModel = "spring")
 public interface UserConvert {
 
+    @Mappings({@Mapping(source = "sex", target = "sexValue")})
     UserInfoVO toUserVO(User user);
 
 }

mini-app/src/main/java/com/onsiteservice/miniapp/controller/user/vo/UserInfoVO.java

@@ -3,10 +3,6 @@ package com.onsiteservice.miniapp.controller.user.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import java.util.List;
 
 @Data
@@ -40,12 +36,18 @@ public class UserInfoVO {
     @ApiModelProperty("头像")
     private String avatar;
 
+    @ApiModelProperty("性别")
+    private Integer sexValue;
+
     @ApiModelProperty("性别 0: 未知 1: 男 2: 女")
-    private Integer sex;
+    private String sex;
 
     @ApiModelProperty("0 普通用户 1 客服 2 估价员 3 销售")
     private Integer roleType;
 
+    @ApiModelProperty("待处理数量（客服用户）")
+    private Integer todo;
+
     @ApiModelProperty("订单信息")
     private List<UserOrderInfoVO> orderInfo;
 }

mini-app/src/main/java/com/onsiteservice/miniapp/service/user/UserService.java

 package com.onsiteservice.miniapp.service.user;
 
+import com.onsiteservice.common.runner.InitDataRunner;
+import com.onsiteservice.constant.constant.DictConstants;
 import com.onsiteservice.constant.constant.RedisKeyConstants;
 import com.onsiteservice.constant.enums.BizCodeEnum;
 import com.onsiteservice.constant.enums.SendCodeEnum;
+import com.onsiteservice.constant.enums.ServiceOrderStatusEnum;
+import com.onsiteservice.constant.enums.ServiceUserTypeEnum;
 import com.onsiteservice.core.exception.ServiceException;
 import com.onsiteservice.core.result.Result;
 import com.onsiteservice.core.result.ResultGenerator;
 import com.onsiteservice.dao.common.AbstractMapper;
 import com.onsiteservice.dao.mapper.user.UserMapper;
+import com.onsiteservice.entity.order.ServiceOrder;
 import com.onsiteservice.entity.user.User;
 import com.onsiteservice.miniapp.controller.user.convert.UserConvert;
 import com.onsiteservice.miniapp.controller.user.dto.BindPhoneDTO;
@@ -22,9 +27,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Condition;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 @Service
@@ -107,6 +114,15 @@ public class UserService extends AbstractMapper<User> {
     public UserInfoVO getInfo(Long userId) {
         var user = userMapper.selectByPrimaryKey(userId);
         var vo = userConvert.toUserVO(user);
+        vo.setSex(InitDataRunner.dictData.get(DictConstants.SEX).get(vo.getSexValue()).get("value").toString());
+
+        // 待处理数量
+        if (Objects.equals(user.getRoleType(), ServiceUserTypeEnum.ADMIN.getId())) {
+            Condition condition = new Condition(ServiceOrder.class);
+            condition.createCriteria().andEqualTo("orderStatus", ServiceOrderStatusEnum.RESERVE);
+            int num = selectCountByCondition(condition);
+            vo.setTodo(num);
+        }
         // 获取订单状况
         var numMap = serviceOrderBizMapper.getMyOrderNum(userId);
         vo.setOrderInfo(List.of(