Merge branch 'IGT-dev' of http://120.27.238.55:7000/r/sys-dapp into IGT-dev

wzy

2022-10-29 2c03637a70a51b747db9fa02c10f5de7a32b2df1

 src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java

@@ -4,19 +4,25 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.dto.PriceSettingDto;
import cc.mrbird.febs.dapp.entity.AppVersion;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
import cc.mrbird.febs.dapp.entity.MemberCoinChargeEntity;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.service.DappSystemService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.HashMap;
@@ -138,4 +144,63 @@
        dappMemberService.resetPassword(id);
        return new FebsResponse().success();
    }

    /**
     * App版本-列表
     *
     * @param appVersion
     * @param request
     * @return
     */
    @GetMapping("getAppVersionList")
    public FebsResponse getAppVersionList(AppVersion appVersion, QueryRequest request) {
        Map<String, Object> data = getDataTable(dappMemberService.getAppVersionList(appVersion, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * App版本-删除
     */
    @GetMapping("delAppVersion/{id}")
    @ControllerEndpoint(operation = " App版本-删除", exceptionMessage = "操作失败")
    public FebsResponse delAppVersion(@NotNull(message = "{required}") @PathVariable Long id) {
        return dappMemberService.delCategary(id);
    }

    /**
     * App版本-新增
     */
    @PostMapping("addAppVersion")
    @ControllerEndpoint(operation = " App版本-新增", exceptionMessage = "操作失败")
    public FebsResponse addAppVersion(@Valid AppVersion appVersion) {
        return dappMemberService.addAppVersion(appVersion);
    }

    /**
     * App版本-更新
     */
    @PostMapping("updateAppVersion")
    @ControllerEndpoint(operation = "App版本-更新", exceptionMessage = "操作失败")
    public FebsResponse updateAppVersion(@Valid AppVersion appVersion) {
        return dappMemberService.updateAppVersion(appVersion);
    }

    /**
     * 充值-列表
     */
    @GetMapping("getChargeList")
    public FebsResponse getChargeList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
        Map<String, Object> data = getDataTable(dappMemberService.getChargeListInPage(memberCoinChargeEntity, request));
        return new FebsResponse().success().data(data);
    }

    /**
     *会员列表---拨币
     * @return
     */
    @PostMapping("payUsdt")
    @ControllerEndpoint(operation = "会员列表-确认", exceptionMessage = "操作失败")
    public FebsResponse addCoinConfirm(@Valid DappMemberEntity memberEntity) {
        return dappMemberService.payUsdt(memberEntity);
    }
}