用户详情

cif-service/src/main/java/com/txz/cif/web/bo/UserDetailBo.java

@@ -67,7 +67,7 @@ public class UserDetailBo {
     private Integer teamNum;
 
     @ApiModelProperty(value="钱包余额")
-    private BigDecimal balance;
+    private BigDecimal walletBalance;
 
     @ApiModelProperty(value="收益余额")
     private BigDecimal earningsBalance;

cif-service/src/main/java/com/txz/cif/web/mng/UserController.java

@@ -19,6 +19,7 @@ import com.txz.cif.enums.BizTypeEnum;
 import com.txz.cif.util.IpUtils;
 import com.txz.cif.web.bo.UserBo;
 import com.txz.cif.web.bo.UserBo2;
+import com.txz.cif.web.bo.UserDetailBo;
 import com.txz.cif.web.bo.UserInfoBO;
 import com.txz.cif.web.para.LoginAccountParameters;
 import com.txz.cif.web.para.MyUserParam;
@@ -53,6 +54,11 @@ public class UserController extends AbstractApiController {
     @Resource
     private AccountService accountService;
 
+    @Resource
+    private RedEnvelopeService redEnvelopeService;
+
+    @Resource
+    private ConfigMemberService configMemberService;
 
     @PostMapping("/list")
     @ApiOperation(value = "获取用户",httpMethod = "POST")
@@ -111,6 +117,7 @@ public class UserController extends AbstractApiController {
                 bo.setWalletBalance(wallet.getBalance());
                 Account earnings = accountService.getAccount(u.getId(), 2);
                 bo.setEarningsBalance(earnings.getBalance());
+
                 return bo;
             }).collect(Collectors.toList()));
         } catch (Exception e) {
@@ -122,9 +129,46 @@ public class UserController extends AbstractApiController {
 
     @GetMapping("/detail")
     @ApiOperation(value = "获取用户详情",httpMethod = "GET")
-    public Result<List<UserBo2>> list(@RequestParam Long userId) {
+    public Result<UserDetailBo> list(@RequestParam Long userId) {
+        User u = userService.findById(userId);
+        if (u == null){
+            return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
+        }
+        UserDetailBo bo = BeanUtil.toBean(u,UserDetailBo.class);
+        Condition c  = new Condition(User.class);
+        c.createCriteria().andEqualTo("pid",u.getId());
+        Integer inviteNum = userService.countByCondition(c);
+        bo.setInviteNum(inviteNum);
+        c  = new Condition(User.class);
+        c.createCriteria().andEqualTo("ppid",u.getId());
+        Integer inviteNextNum = userService.countByCondition(c);
+        bo.setTeamNum(inviteNum+inviteNextNum);
+        //付款过的订单
+        c  = new Condition(Flow.class);
+        c.createCriteria().andIn("bizType", CollUtil.newArrayList(BizTypeEnum.OPEN_GROUP_PAY.getKey(),BizTypeEnum.JOIN_GROUP_PAY.getKey()));
+        Integer payNum = flowService.countByCondition(c);
+        bo.setSuccessGroupNum(payNum);
+        //钱包余额
+        Account wallet = accountService.getAccount(u.getId(), 1);
+        bo.setWalletBalance(wallet.getBalance());
+        Account earnings = accountService.getAccount(u.getId(), 2);
+        bo.setEarningsBalance(earnings.getBalance());
 
-        return ResultGenerator.genSuccessResult();
+        //  可参团数
+        ConfigMember member = configMemberService.findBy("level", u.getVipLevel());
+        bo.setGroupNum(member.getJoinedGroupsNo());
+        BigDecimal totalEarnings  = redEnvelopeService.sumWithDay(null, u.getId(), 3);
+        bo.setTotalEarnings(totalEarnings);
+        //已结算金额
+        bo.setSettledEarnings(earnings.getTotalInamount());
+        //充值总金额
+        bo.setRechargeAmount(wallet.getTotalInamount());
+        BigDecimal l7DEarnings =  redEnvelopeService.sumWithDay(7, u.getId(), 3);
+        bo.setL7DEarnings(l7DEarnings);
+        BigDecimal pendingEarnings =  redEnvelopeService.sumWithDay(null, u.getId(), 1);
+        bo.setPendingEarnings(pendingEarnings);
+        bo.setWithdrawAmount(earnings.getTotalOutAmount());
+        return ResultGenerator.genSuccessResult(bo);
     }