Merge branch 'master' of http://120.27.238.55:7000/r/agent

Helius

2021-04-23 9beb428f807920b0dd646edbed822313c47961c6

 src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java

@@ -40,8 +40,31 @@
    @GetMapping("getFeeAmountList")
    public FebsResponse getFeeAmountList(MemberEntity memberEntity, QueryRequest request) {
        User user = getCurrentUser();
        memberEntity.setRefererId(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
        memberEntity.setRefererIds(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
        Map<String, Object> data = getDataTable(memberService.findFeeAmountList(memberEntity, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 数据总览
     * @param memberEntity
     * @param request
     * @return
     */

    @GetMapping("allMemberData")
    public FebsResponse allMemberData(MemberEntity memberEntity, QueryRequest request) {
        User user = getCurrentUser();
        memberEntity.setRefererIds(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
        Map<String, Object> data = getDataTable(memberService.findAllMemberDataList(memberEntity, request));
        return new FebsResponse().success().data(data);
    }

    @GetMapping("getMemberAssets")
    public FebsResponse getMemberAssets(MemberEntity memberEntity, QueryRequest request) {
        User user = getCurrentUser();
        memberEntity.setRefererIds(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
        Map<String, Object> data = getDataTable(memberService.findMemberAssetList(memberEntity, request));
        return new FebsResponse().success().data(data);
    }
}