20221020

xiaoyong931011

2022-10-20 14af0f18ab6d0a750e7ba1b5c537c310695ac610

20221020

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

@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.annotation.EncryptEnable;
import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.Map;

/**
 * @author
@@ -33,7 +35,7 @@
@RestController
@Api(value = "dapp接口", tags = "dapp接口")
@RequestMapping(value = "/dapi/member")
public class ApiDappMemberController {
public class ApiDappMemberController extends BaseController {

    private final DappWalletService dappWalletService;
    private final DappSystemService dappSystemService;
@@ -153,7 +155,8 @@
    })
    @PostMapping(value = "/findAmountInPage")
    public FebsResponse findAmountInPage(@RequestBody ApiAmountChangeDto apiAmountChangeDto) {
        return new FebsResponse().success().data(dappMemberService.findAmountInPage(apiAmountChangeDto));
        Map<String, Object> data = getDataTable(dappMemberService.findAmountInPage(apiAmountChangeDto));
        return new FebsResponse().success().data(data);
    }

    @ApiOperation(value ="IGT我的团队-新增团队成员", notes = "我的团队-新增团队成员")
@@ -168,7 +171,9 @@
    })
    @PostMapping(value = "/myTeammateInfo")
    public FebsResponse myTeammateInfo(@RequestBody ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
        return dappMemberService.myTeammateInfo(apiMyTeammateInfoDto);

        Map<String, Object> data = getDataTable(dappMemberService.myTeammateInfo(apiMyTeammateInfoDto));
        return new FebsResponse().success().data(data);
    }

    @ApiOperation(value ="IGT我的团队-资金记录-分页", notes = "我的团队-资金记录-分页")
@@ -177,7 +182,8 @@
    })
    @PostMapping(value = "/teammateChangeListInPage")
    public FebsResponse teammateChangeListInPage(@RequestBody ApiAmountChangeDto apiAmountChangeDto) {
        return dappMemberService.findTeammateChangeListInPage(apiAmountChangeDto);
        Map<String, Object> data = getDataTable(dappMemberService.findTeammateChangeListInPage(apiAmountChangeDto));
        return new FebsResponse().success().data(data);
    }

    @ApiOperation(value = "IGT更新登录密码", notes = "更新登录密码")

 src/main/java/cc/mrbird/febs/dapp/entity/DappBank.java

New file
@@ -0,0 +1,21 @@
package cc.mrbird.febs.dapp.entity;

import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@Data
@TableName("dapp_bank")
public class DappBank extends BaseEntity {
    private Long member_id;//
    private Integer type;//银行卡类型 1：个人 2：商务
    private String cardCode;//银行卡号
    private String bankName;//银行名称
    private String bankOtherName;//支行名称
    private String country;//国家
    private String province;//省/市
    private String address;//开户地址
    private String identifyCode;//银行识别码
    private String swiftBicCode;//swift_bic码
    private String ibanCode;//iban码
}

 src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java

New file
@@ -0,0 +1,7 @@
package cc.mrbird.febs.dapp.mapper;

import cc.mrbird.febs.dapp.entity.DappBank;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

public interface DappBankDao extends BaseMapper<DappBank> {
}

 src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java

@@ -6,9 +6,7 @@
import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
import cc.mrbird.febs.dapp.vo.ApiAmountChangeListVo;
import cc.mrbird.febs.dapp.vo.MemberInfoVo;
import cc.mrbird.febs.dapp.vo.TeamListVo;
import cc.mrbird.febs.dapp.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -68,13 +66,13 @@

    Boolean validateTransferCode(String transferCode,Long memberId);

    List<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto);
    IPage<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto);

    FebsResponse addTeammate(ApiAddTeammateDto apiAddTeammateDto);

    FebsResponse myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto);
    IPage<ApiMyTeammateInfoListVo> myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto);

    FebsResponse amountType();

    FebsResponse findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto);
    IPage<ApiMyTeammateAmountChangeListVo> findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto);
}

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java

@@ -681,7 +681,7 @@
    }

    @Override
    public List<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto) {
    public IPage<ApiAmountChangeListVo> findAmountInPage(ApiAmountChangeDto apiAmountChangeDto) {
        Page<ApiAmountChangeListVo> page = new Page<>(apiAmountChangeDto.getPageNum(), apiAmountChangeDto.getPageSize());

        DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -697,7 +697,7 @@
        }
        dappAccountMoneyChangeEntity.setMemberId(member.getId());
        IPage<ApiAmountChangeListVo> records = dappAccountMoneyChangeDao.selectChangeListInPage(page, dappAccountMoneyChangeEntity);
        return records.getRecords();
        return records;
    }

    @Override
@@ -770,7 +770,7 @@
    }

    @Override
    public FebsResponse myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
    public IPage<ApiMyTeammateInfoListVo> myTeammateInfo(ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Page<ApiMyTeammateInfoListVo> page = new Page<>(apiMyTeammateInfoDto.getPageNum(), apiMyTeammateInfoDto.getPageSize());
        if(ObjectUtil.isEmpty(apiMyTeammateInfoDto.getInviteId())){
@@ -789,7 +789,7 @@
                }
            }
        }
        return new FebsResponse().success().data(apiMyTeammateInfoListVos);
        return apiMyTeammateInfoListVos;
    }

    @Override
@@ -807,12 +807,12 @@
    }

    @Override
    public FebsResponse findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto) {
    public IPage<ApiMyTeammateAmountChangeListVo> findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Page<ApiMyTeammateAmountChangeListVo> page = new Page<>(apiAmountChangeDto.getPageNum(), apiAmountChangeDto.getPageSize());
        apiAmountChangeDto.setInviteId(member.getInviteId());
        IPage<ApiMyTeammateAmountChangeListVo> amountChangeList = dappAccountMoneyChangeDao.selectTeammateChangeListInPage(apiAmountChangeDto,page);
        return new FebsResponse().success().data(amountChangeList);
        return amountChangeList;
    }

    public String generateAsaToken(String token) {