add refresh token

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -169,7 +169,7 @@ public class UserService {
         refreshToken(deviceUserVo);
         save(deviceUserVo);
 
-        UserInfoVo userInfoVo = toUserInfoVo(deviceUserVo, false);
+        UserInfoVo userInfoVo = toUserInfoVo(deviceUserVo, true);
         return APIResult.ok(userInfoVo);
     }
 

rankin-user-service/src/main/java/cn/rankin/userservice/controller/CollectionController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class CollectionController {
 
     @RequestMapping(method = RequestMethod.PUT)
-    public APIResult<Boolean> add(@RequestBody CollectionDTO collectionDTO) {
+    public APIResult<Boolean> put(@RequestBody CollectionDTO collectionDTO) {
         return null;
     }
 }

rankin-user-service/src/main/java/cn/rankin/userservice/repository/CollectionRepository.java

@@ -4,4 +4,6 @@ import cn.rankin.common.utils.jpa.BasicJpaRepository;
 import cn.rankin.data.api.user.entity.Collection;
 
 public interface CollectionRepository extends BasicJpaRepository<Collection, String> {
+
+    Collection findByPidAndUserId(String productId, String userId);
 }

rankin-user-service/src/main/java/cn/rankin/userservice/service/CollectionService.java

@@ -2,13 +2,19 @@ package cn.rankin.userservice.service;
 
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.data.api.user.dto.CollectionDTO;
 import cn.rankin.data.api.user.entity.Collection;
+import cn.rankin.userservice.code.UserServiceAPICode;
 import cn.rankin.userservice.repository.CollectionRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
+import static cn.rankin.userservice.utils.DTOConverter.convert;
+
 @Service
 @Slf4j
 public class CollectionService {
@@ -17,10 +23,27 @@ public class CollectionService {
     private CollectionRepository collectionRepository;
 
     public APIResult<Boolean> put(CollectionDTO collectionDTO) {
+        Collection collection = collectionRepository.findByPidAndUserId(collectionDTO.getPid(), collectionDTO.getUserId());
+        if (collection != null) {
+            if (collection.getStatus().equals(BaseStatusEnum.NORMAL)) {
+                return APIResult.error(UserServiceAPICode.ALREADY_EXISTS);
+            }else {
+                collection.setStatus(BaseStatusEnum.NORMAL);
+                collectionRepository.save(collection);
+                return APIResult.ok(true);
+            }
+        }
+
+        Collection newCollection = convert(collectionDTO);
+
+        return null;
+    }
+
+    public APIResult<Page<Collection>> getPage(String userId, Integer start, Integer size) {
         return null;
     }
 
-    public APIResult<Page<Collection>> getCollections(String userId, Integer start, Integer size) {
+    public APIResult<List<Collection>> gets(String userId, Integer size) {
         return null;
     }
 

rankin-user-service/src/main/java/cn/rankin/userservice/utils/DTOConverter.java

@@ -1,15 +1,9 @@
 package cn.rankin.userservice.utils;
 
 import cn.rankin.common.utils.constant.Constant;
-import cn.rankin.data.api.user.dto.CampusDTO;
-import cn.rankin.data.api.user.dto.CmsUserDTO;
-import cn.rankin.data.api.user.dto.MerchantDTO;
-import cn.rankin.data.api.user.dto.TerminalUserDTO;
+import cn.rankin.data.api.user.dto.*;
+import cn.rankin.data.api.user.entity.*;
 import cn.rankin.userservice.dto.UserRegistry;
-import cn.rankin.data.api.user.entity.Campus;
-import cn.rankin.data.api.user.entity.CmsUser;
-import cn.rankin.data.api.user.entity.Merchant;
-import cn.rankin.data.api.user.entity.TerminalUser;
 import org.springframework.beans.BeanUtils;
 
 import java.math.BigDecimal;
@@ -49,4 +43,10 @@ public class DTOConverter {
         userRegistry.setPasswd(terminalUser.getPassword());
         return userRegistry;
     }
+
+    public static Collection convert(CollectionDTO collectionDTO) {
+        Collection collection = new Collection();
+        BeanUtils.copyProperties(collectionDTO, collection);
+        return collection;
+    }
 }