From e9e2905bfc18dd68562f9e9711ce60f67ec28aa7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Oct 2022 16:05:28 +0800
Subject: [PATCH] 20221020
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 2
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 2 +
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 10 +++++
src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java | 20 ++++++++++
src/main/java/cc/mrbird/febs/dapp/entity/DappBank.java | 1
src/main/resources/mapper/dapp/DappBankDao.xml | 16 ++++++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 11 +++++
src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java | 17 ++++++++
src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java | 8 ++++
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 2
10 files changed, 86 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index b43bfb2..2777c92 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -191,4 +191,14 @@
public FebsResponse updatePassword(@RequestBody ApiUpdatePasswordDto apiUpdatePasswordDto) {
return dappWalletService.updatePassword(apiUpdatePasswordDto);
}
+
+ @ApiOperation(value ="IGT银行卡-列表分页", notes = "银行卡-列表分页")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "success", response = ApiBankListVo.class)
+ })
+ @PostMapping(value = "/bankList")
+ public FebsResponse bankList(@RequestBody ApiBankListDto apiBankListDto) {
+ Map<String, Object> data = getDataTable(dappMemberService.getBankListInPage(apiBankListDto));
+ return new FebsResponse().success().data(data);
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java
new file mode 100644
index 0000000..045f999
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java
@@ -0,0 +1,20 @@
+package cc.mrbird.febs.dapp.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ApiBankListDto", description = "银行卡列表接收参数类")
+public class ApiBankListDto {
+
+ @ApiModelProperty(value = "页码")
+ private Integer pageNum = 1;
+
+ @ApiModelProperty(value = "每页数量")
+ private Integer pageSize = 10;
+
+ @TableField(exist = false)
+ private Long memberId;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappBank.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappBank.java
index d37f963..9738e46 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappBank.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappBank.java
@@ -9,6 +9,7 @@
public class DappBank extends BaseEntity {
private Long member_id;//
private Integer type;//银行卡类型 1：个人 2：商务
+ private String memberName;//持卡人姓名
private String cardCode;//银行卡号
private String bankName;//银行名称
private String bankOtherName;//支行名称
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java
index 0a5bfc0..1af721b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java
@@ -1,7 +1,15 @@
package cc.mrbird.febs.dapp.mapper;
+import cc.mrbird.febs.dapp.dto.ApiBankListDto;
import cc.mrbird.febs.dapp.entity.DappBank;
+import cc.mrbird.febs.dapp.vo.ApiBankListVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
public interface DappBankDao extends BaseMapper<DappBank> {
+
+ IPage<ApiBankListVo> selectBankListInPage(@Param("record")ApiBankListDto apiBankListDto, Page<ApiBankListVo> page);
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index fa409a1..c68bd48 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -75,4 +75,6 @@
FebsResponse amountType();
IPage<ApiMyTeammateAmountChangeListVo> findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto);
+
+ IPage<ApiBankListVo> getBankListInPage(ApiBankListDto apiBankListDto);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index 8ac4993..ae11270 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -197,7 +197,7 @@
dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total);
//生成流水记录
BigDecimal add = availableAmount.add(total);
- DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, total, add, "挂机收益", 5);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, total, add, "投注盈利", 5);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
//更新用户表是否正在挂机状态字段为否
DappMemberEntity dappMember= dappMemberDao.selectById(memberId);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 5839edb..813b090 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -64,7 +64,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final PlatformBannerMapper platformBannerMapper;
private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
- private final DappMemberService dappMemberService;
+ private final DappBankDao dappBankDao;
private final RedisTemplate<String, Object> redisTemplate;
@@ -815,6 +815,15 @@
return amountChangeList;
}
+ @Override
+ public IPage<ApiBankListVo> getBankListInPage(ApiBankListDto apiBankListDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Page<ApiBankListVo> page = new Page<>(apiBankListDto.getPageNum(), apiBankListDto.getPageSize());
+ apiBankListDto.setMemberId(member.getId());
+ IPage<ApiBankListVo> apiBankListVoIPage = dappBankDao.selectBankListInPage(apiBankListDto,page);
+ return apiBankListVoIPage;
+ }
+
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java
new file mode 100644
index 0000000..0f1d806
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java
@@ -0,0 +1,17 @@
+package cc.mrbird.febs.dapp.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ApiBankListVo", description = "银行卡列表")
+public class ApiBankListVo {
+ private Long id;
+
+ @ApiModelProperty(value = "持卡人姓名")
+ private String memberName;
+
+ @ApiModelProperty(value = "银行卡号")
+ private String cardCode;
+}
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index c695d44..05f9b0b 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -127,7 +127,7 @@
BigDecimal add = availableAmount.add(total);
- DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, total, add, "挂机收益", 5);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, total, add, "投注盈利", 5);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
}
diff --git a/src/main/resources/mapper/dapp/DappBankDao.xml b/src/main/resources/mapper/dapp/DappBankDao.xml
new file mode 100644
index 0000000..6f07358
--- /dev/null
+++ b/src/main/resources/mapper/dapp/DappBankDao.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.dapp.mapper.DappBankDao">
+
+ <select id="selectBankListInPage" resultType="cc.mrbird.febs.dapp.vo.ApiBankListVo">
+ select
+ concat(left(a.card_code,4), '******', right(a.card_code,4)) cardCode,
+ a.member_name memberName,
+ a.id id
+ from dapp_bank a
+ where a.member_id=#{record.memberId}
+ order by a.create_time desc
+ </select>
+
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1