20210517 云顶

xiaoyong931011

2021-05-18 d123da994f9e70a56a95586c3c9c2fd0f8cbcfce

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

@@ -5,6 +5,7 @@
import com.xcong.excoin.common.entity.FebsResponse;

import com.xcong.excoin.common.entity.QueryRequest;

import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;

import com.xcong.excoin.modules.member.entity.ActivityReceiveRecord;

import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;

import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;

import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;

@@ -39,6 +40,29 @@
public class MemberController extends BaseController {



    private final IMemberService memberService;

    
    /**

     * 会员列表---会员活动领取---详情

     */

    @GetMapping("/seeReceiveInfo")

    public FebsResponse seeReceiveInfo(QueryRequest request, ActivityReceiveRecord activityReceiveRecord,Integer parentId) {

        if(parentId==null){

            ViewController.idFromMember=0;

        }

        activityReceiveRecord.setId(ViewController.idFromMember);

        Map<String, Object> dataTable = getDataTable(memberService.seeReceiveInfo(request, activityReceiveRecord));

        return new FebsResponse().success().data(dataTable);

    }

    
    /**

     * 会员列表---会员活动领取

     * @return

     */

    @GetMapping("memberActivityReceive")

    public FebsResponse memberActivityReceive(ActivityReceiveRecord activityReceiveRecord, QueryRequest request) {

        Map<String, Object> data = getDataTable(memberService.memberActivityReceive(activityReceiveRecord, request));

        return new FebsResponse().success().data(data);

    }

    

    /**

     *会员列表---拨币

@@ -437,6 +461,15 @@
       Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));

        return new FebsResponse().success().data(data);

    }



    /**

     * 平台全部信息---列表Test===加查询

     */

    @GetMapping("allDataInfo")

    public FebsResponse allDataInfo(MemberEntity memberEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(memberService.findAllDataInfoListInPage(memberEntity, request));

        return new FebsResponse().success().data(data);

    }

    

    

}