企业套餐

src/main/java/com/izouma/jiashanxia/repo/PackageRepo.java

@@ -16,5 +16,5 @@ public interface PackageRepo extends JpaRepository<Package, Long>, JpaSpecificat
     @Transactional
     void softDelete(Long id);
 
-    List<Package> findAllByType(PackageType type);
+    List<Package> findAllByTypeAndDelFalse(PackageType type);
 }

src/main/java/com/izouma/jiashanxia/service/UserService.java

@@ -246,9 +246,9 @@ public class UserService {
     /*
     我的推广
     */
-    public List<User> myPromotion(Long userId) {
+    public Set<User> myPromotion(Long userId) {
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("无用户"));
-        List<User> users = new ArrayList<>();
+        Set<User> users = new HashSet<>();
         // 如果是企业创始人，查出下级所有推广
         if (user.getTeamFounder()) {
             List<User> employees = userRepo.findAllByCompanyIdAndDelFalse(user.getCompanyId());

src/main/java/com/izouma/jiashanxia/web/PackageController.java

@@ -63,7 +63,7 @@ public class PackageController extends BaseController {
     @GetMapping("/team")
     @ApiOperation("团队套餐")
     public List<Package> team() {
-        return packageRepo.findAllByType(PackageType.TEAM);
+        return packageRepo.findAllByTypeAndDelFalse(PackageType.TEAM);
     }
 
     @PostMapping("/openTeamSet")

src/main/java/com/izouma/jiashanxia/web/UserController.java

@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @AllArgsConstructor
 @RestController
@@ -154,7 +155,7 @@ public class UserController extends BaseController {
 
     @GetMapping("/myPromotion")
     @ApiOperation("我的推广列表")
-    public List<User> myPromotion() {
+    public Set<User> myPromotion() {
         return userService.myPromotion(SecurityUtils.getAuthenticatedUser().getId());
     }
 

src/test/java/com/izouma/jiashanxia/service/UserServiceTest.java

@@ -15,6 +15,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 
 @SpringBootTest
@@ -28,8 +29,9 @@ public class UserServiceTest {
 
     @Test
     public void myPromotion() {
-        Page<PromotionDTO> users = userService.myPromotion(new PageQuery(), 40L);
-        users.getContent().forEach(System.out::println);
+//        Page<PromotionDTO> users = userService.myPromotion(new PageQuery(), 40L);
+        Set<User> users = userService.myPromotion( 125L);
+        users.forEach(System.out::println);
     }
 
     @Test