xiaoyong931011
2023-08-15 f9b6accb4ca10a20ff293ff53c371b53e68ee96f
后台修改
7 files modified
1 files added
66 ■■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/dto/ChangeInPageDto.java 19 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/mapper/DappAccountMoneyChangeDao.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java 4 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java 15 ●●●● patch | view | raw | blame | history
src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml 7 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappNodeOrderEntity;
import cc.mrbird.febs.dapp.service.DappMemberService;
@@ -67,10 +68,18 @@
    })
    @PostMapping(value = "/recordInPage")
    public FebsResponse recordInPage(@RequestBody RecordInPageDto recordInPageDto) {
//        return new FebsResponse().success().data(dappWalletService.recordInPage(recordInPageDto));
        return new FebsResponse().success().data(dappWalletService.getRecordVoInPage(recordInPageDto));
    }
    @ApiOperation(value = "共享收入与业绩", notes = "共享收入与业绩")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = DappAccountMoneyChangeEntity.class)
    })
    @GetMapping(value = "/changeInPage")
    public FebsResponse changeInPage(@RequestBody ChangeInPageDto changeInPageDto) {
        return dappWalletService.getChangeInPageInPage(changeInPageDto);
    }
    @ApiOperation(value = "兑换AUSDT", notes = "兑换AUSDT")
    @PostMapping(value = "/transferAusd")
    public FebsResponse transferAusd(@RequestBody TransferAusdDto transferAusdDto) {
src/main/java/cc/mrbird/febs/dapp/dto/ChangeInPageDto.java
New file
@@ -0,0 +1,19 @@
package cc.mrbird.febs.dapp.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "ChangeInPageDto", description = "记录列表接收参数类")
public class ChangeInPageDto {
    @ApiModelProperty(value = "页码")
    private Integer pageNum = 1;
    @ApiModelProperty(value = "每页数量")
    private Integer pageSize = 10;
    @ApiModelProperty(hidden = true)
    private Long memberId;
}
src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -32,10 +33,14 @@
    //原有积分
    private BigDecimal preAmount;
    //预期
    private BigDecimal amount;
    //实际
    private BigDecimal afterAmount;
    @ApiModelProperty(value = "贡献收入与业绩显示内容")
    private String content;
    /**
src/main/java/cc/mrbird/febs/dapp/mapper/DappAccountMoneyChangeDao.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.mapper;
import cc.mrbird.febs.dapp.dto.ChangeInPageDto;
import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.vo.MemberMoneyFlowVo;
@@ -13,4 +14,6 @@
    IPage<DappAccountMoneyChangeEntity> selectInPage(@Param("record") DappAccountMoneyChangeEntity record, Page<DappAccountMoneyChangeEntity> page);
    IPage<MemberMoneyFlowVo> selectMemberMoneyFlowInPage(Page<MemberMoneyFlowVo> page, @Param("record") DappMemberEntity dappMemberEntity);
    IPage<DappAccountMoneyChangeEntity> getChangeInPageInPage(Page<DappAccountMoneyChangeEntity> page, @Param("record") ChangeInPageDto changeInPageDto);
}
src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
@@ -61,4 +61,6 @@
    FebsResponse withdrawAgree(Long id);
    FebsResponse withdrawDisAgree(Long id);
    FebsResponse getChangeInPageInPage(ChangeInPageDto changeInPageDto);
}
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -3066,7 +3066,9 @@
                    amountMagic,
                    localTotalAchieve,
                    AccountFlowEnum.AMOUNT_RECORD.getCode(),
                    null);
                    "今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+",实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
                            "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN)+",原因消费金额1%加速上" +
                            "限,增加消费金额可获得更多收益");
            dappAccountMoneyChangeDao.insert(record);
            //实时更新用户等级
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -17,10 +17,7 @@
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.BoxUtil;
import cc.mrbird.febs.dapp.vo.ActiveNftListVo;
import cc.mrbird.febs.dapp.vo.DappFundFlowVo;
import cc.mrbird.febs.dapp.vo.DappMemberNodeVo;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
import cc.mrbird.febs.dapp.vo.*;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField;
@@ -749,4 +746,14 @@
        this.updateWalletCoinWithLock(dappFundFlowEntity.getAmount().negate(), dappMemberEntity.getId(), 1);
        return new FebsResponse().success();
    }
    @Override
    public FebsResponse getChangeInPageInPage(ChangeInPageDto changeInPageDto) {
        DappMemberEntity member = LoginUserUtil.getAppUser();
        Long memberId = member.getId();
        changeInPageDto.setMemberId(memberId);
        Page<DappAccountMoneyChangeEntity> page = new Page<>(changeInPageDto.getPageNum(), changeInPageDto.getPageSize());
        IPage<DappAccountMoneyChangeEntity> memberMoneyFlowVos = dappAccountMoneyChangeDao.getChangeInPageInPage(page,changeInPageDto);
        return new FebsResponse().success().data(memberMoneyFlowVos);
    }
}
src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
@@ -23,4 +23,11 @@
        order by a.create_time desc
    </select>
    <select id="getChangeInPageInPage" resultType="cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity">
        select a.*
        from dapp_account_money_change a
        where a.member_id = #{record.memberId}
        order by a.create_time desc
    </select>
</mapper>