20200630 代码提交

xiaoyong931011

2020-06-30 2d57b956efa9227c602ab6598bfa8958fcea3e34

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

@@ -4,13 +4,13 @@
import com.xcong.excoin.common.controller.BaseController;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.member.dto.MemberDataInfoDto;
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
import com.xcong.excoin.modules.member.service.IMemberService;
import com.xcong.excoin.system.entity.User;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -127,14 +127,6 @@
     */
    @GetMapping("memberWithdrawCoin")
    public FebsResponse memberWithdrawCoin(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
       String isInside = memberCoinWithdrawEntity.getIsInside();
       if(!"".equals(isInside) && isInside != null) {
          if("1".equals(isInside)) {
             memberCoinWithdrawEntity.setIsInside("Y");
          }else {
             memberCoinWithdrawEntity.setIsInside("N");
          }
       }
        Map<String, Object> data = getDataTable(memberService.findmemberWithdrawCoinListInPage(memberCoinWithdrawEntity, request));
        return new FebsResponse().success().data(data);
    }
@@ -159,4 +151,25 @@
        return memberService.memberWithdrawCoinCancel(id);
    }
    
    /**
     * 平台详细信息---列表
     */
    @GetMapping("memberDataInfo")
    public FebsResponse memberDataInfo(MemberEntity memberEntity, QueryRequest request) {
        Map<String, Object> data = getDataTable(memberService.findMemberDataInfoDtoListInPage(memberEntity, request));
        return new FebsResponse().success().data(data);
    }
    
    /**
     * 用户详细信息---列表
     * @return
     */
    @GetMapping("memberDataInfoList")
    @ControllerEndpoint(operation = "用户详细信息---充币记录", exceptionMessage = "取消失败")
    public FebsResponse memberDataInfoList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
       Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));
        return new FebsResponse().success().data(data);
    }
    
    
}