Temporarily add /user/product/valid in product service

rankin-api-web/src/main/java/cn/rankin/apiweb/controller/UserController.java

@@ -2,6 +2,7 @@ package cn.rankin.apiweb.controller;
 
 import cn.rankin.apiweb.assist.resolver.NeedUser;
 import cn.rankin.apiweb.code.ApiWebCode;
+import cn.rankin.apiweb.service.product.ProductService;
 import cn.rankin.apiweb.service.user.UserService;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.data.api.app.vo.DeviceUserVo;
@@ -24,6 +25,9 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private ProductService productService;
+
     @RequestMapping(method = RequestMethod.GET)
     public APIResult<UserInfoVo> getUserInfo(@NeedUser DeviceUserVo deviceUserVo) {
         String uid = deviceUserVo.getUid();

rankin-api-web/src/main/java/cn/rankin/apiweb/service/product/ProductClient.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(name = "${service.product.name}")
 public interface ProductClient {
@@ -62,6 +63,11 @@ public interface ProductClient {
                                    @RequestParam("offset") Integer offset, @RequestParam("sortKey") String sortKey,
                                    @RequestParam("direction") Sort.Direction direction);
 
+    @RequestMapping(value = "/user/{uid}/product/valid", method = RequestMethod.GET)
+    List<Map<String, Object>> getProductValid(@PathVariable("uid") String uid, @RequestParam("start") Long start,
+                                              @RequestParam("offset") Integer offset, @RequestParam("sortKey") String sortKey,
+                                              @RequestParam("direction") Sort.Direction direction);
+
 
     @Component
     class ProductClientHystrix implements ProductClient {
@@ -132,5 +138,11 @@ public interface ProductClient {
         }
 
 
+        @Override
+        public List<Map<String, Object>> getProductValid(String uid, Long start,
+                                                         Integer offset, String sortKey, Sort.Direction direction){
+            return new ArrayList<>();
+        }
+
     }
 }

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

@@ -7,14 +7,9 @@ import cn.rankin.data.api.user.vo.TerminalDeviceVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
 import cn.rankin.data.api.user.vo.WhiteUserVo;
 import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 @FeignClient(name = "${service.user.name}", fallback = UserClient.UserServiceHystrix.class)
 public interface UserClient {
 
@@ -39,10 +34,6 @@ public interface UserClient {
     @RequestMapping(value = "/white/user/{userId}", method = RequestMethod.GET)
     APIResult<WhiteUserVo> findWhiteUserById(@PathVariable("userId") String userId);
 
-    @RequestMapping(value = "/user/{uid}/product/valid", method = RequestMethod.GET)
-    List<Map<String, Object>> getProductValid(@PathVariable("uid") String uid, @RequestParam("start") Long start,
-                                              @RequestParam("offset") Integer offset, @RequestParam("sortKey") String sortKey,
-                                              @RequestParam("direction") Sort.Direction direction);
 
     @Component
     class UserServiceHystrix implements UserClient {
@@ -82,10 +73,5 @@ public interface UserClient {
             return APIResult.error(ApiWebCode.SERVER_ERROR);
         }
 
-        @Override
-        public List<Map<String, Object>> getProductValid(String uid, Long start,
-                                             Integer offset, String sortKey, Sort.Direction direction){
-            return new ArrayList<>();
-        }
     }
 }

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

@@ -1,6 +1,7 @@
 package cn.rankin.apiweb.service.user;
 
 import cn.rankin.apiweb.code.ApiWebCode;
+import cn.rankin.apiweb.service.product.ProductClient;
 import cn.rankin.apiweb.utils.SecurityManager;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.model.BaseCode;
@@ -10,6 +11,7 @@ import cn.rankin.common.utils.service.RedisService;
 import cn.rankin.data.api.app.dto.LoginInfoDTO;
 import cn.rankin.data.api.app.vo.DeviceUserVo;
 import cn.rankin.data.api.app.vo.UserInfoVo;
+import cn.rankin.data.api.product.entity.Product;
 import cn.rankin.data.api.user.dto.TerminalDeviceDTO;
 import cn.rankin.data.api.user.vo.TerminalDeviceVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
@@ -42,6 +44,9 @@ public class UserService {
     private UserClient userClient;
 
     @Autowired
+    private ProductClient productClient;
+
+    @Autowired
     private RedisService redisService;
 
     public APIResult<UserInfoVo> login(LoginInfoDTO loginInfoDTO) {
@@ -253,6 +258,7 @@ public class UserService {
     }
 
     public List<Map<String, Object>> getProductValid(String uid){
-        return userClient.getProductValid(uid, 0L, 50, "endTime", Sort.Direction.ASC);
+        //TODO: move this method to userCient
+        return productClient.getProductValid(uid, 0L, 50, "endTime", Sort.Direction.ASC);
     }
 }