|
@@ -4,12 +4,16 @@ import com.txz.cif.core.AuthService;
|
|
|
import com.txz.cif.core.Result;
|
|
|
import com.txz.cif.core.ResultGenerator;
|
|
|
import com.txz.cif.model.RedEnvelope;
|
|
|
+import com.txz.cif.model.User;
|
|
|
import com.txz.cif.service.RedEnvelopeService;
|
|
|
|
|
|
import com.txz.cif.core.ResultCode;
|
|
|
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
+import com.txz.cif.service.UserService;
|
|
|
+import com.txz.cif.web.bo.UserDetailBo;
|
|
|
+import com.txz.cif.web.bo.UserTopBo;
|
|
|
import com.txz.cif.web.para.RedEnvelopeListParam;
|
|
|
import com.txz.cif.web.para.RedEnvelopeParam;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -26,6 +30,8 @@ import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
+
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
|
|
|
/**
|
|
@@ -44,6 +50,9 @@ public class RedEnvelopeApiController {
|
|
|
@Resource
|
|
|
private AuthService authService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private UserService userService;
|
|
|
+
|
|
|
@PostMapping("/list")
|
|
|
@ApiOperation(value = "redEnvelope获取列表",httpMethod = "POST")
|
|
|
public Result<List<RedEnvelope>> list(@RequestBody RedEnvelopeListParam param, HttpServletRequest request) {
|
|
@@ -83,4 +92,36 @@ public class RedEnvelopeApiController {
|
|
|
}
|
|
|
return ResultGenerator.genSuccessResult(pageInfo);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping("/top")
|
|
|
+ @ApiOperation(value = "排行榜type 1 7天收益排行",httpMethod = "GET")
|
|
|
+ public Result<List<UserTopBo>> top(@RequestParam(defaultValue = "1") Integer type,@RequestParam(defaultValue = "1") Integer page,@RequestParam(defaultValue = "10") Integer size) {
|
|
|
+ List<UserTopBo> tops= redEnvelopeService.top(type,page,size);
|
|
|
+ PageInfo pageInfo = new PageInfo(tops);
|
|
|
+ pageInfo.setList(tops.stream().map(e->{
|
|
|
+ User user = userService.findById(e.getUserId());
|
|
|
+ if (user != null){
|
|
|
+ e.setHeadPic(user.getHeadPic());
|
|
|
+ e.setNickname(user.getNickname());
|
|
|
+ e.setNickname(user.getName());
|
|
|
+ e.setVipLevel(user.getVipLevel());
|
|
|
+ e.setUserNo(user.getUserNo());
|
|
|
+ }
|
|
|
+ Condition c = new Condition(User.class);
|
|
|
+ c.createCriteria().andEqualTo("pid",user.getId());
|
|
|
+ Integer invited = userService.countByCondition(c);
|
|
|
+ if (invited != null){
|
|
|
+ e.setInviteNum(invited);
|
|
|
+ }
|
|
|
+ c = new Condition(User.class);
|
|
|
+ c.createCriteria().andEqualTo("ppid",user.getId());
|
|
|
+ Integer invited2 = userService.countByCondition(c);
|
|
|
+ if (invited != null && invited2 != null){
|
|
|
+ e.setTeamNum(invited+invited2);
|
|
|
+ }
|
|
|
+ return e;
|
|
|
+ }).collect(Collectors.toList()));
|
|
|
+ return ResultGenerator.genSuccessResult(pageInfo);
|
|
|
+ }
|
|
|
}
|