From d7f57903262d8a0db7239fde71a8b7abc48df852 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 24 Apr 2023 15:59:44 +0800
Subject: [PATCH] 资金流水
---
src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java | 3 +
src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html | 33 ++++++++++------
src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java | 4 ++
src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java | 6 +++
src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java | 4 ++
src/test/java/cc/mrbird/febs/ProfitTest.java | 12 +++---
src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java | 6 +++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 4 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 +
9 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java
index d96d705..4779d13 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java
@@ -20,6 +20,12 @@
// 银行卡号
@ApiModelProperty(value = "银行卡号")
private String bankNo;
+ // 银行卡号
+ @ApiModelProperty(value = "开户行")
+ private String bankName;
+ // 银行卡号
+ @ApiModelProperty(value = "支行")
+ private String bankNameS;
// 手机号
@ApiModelProperty(value = "手机号")
private String phone;
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java b/src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java
index c9b1015..82d37bc 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java
@@ -22,7 +22,13 @@
// 银行卡号
@ApiModelProperty(value = "银行卡号")
private String bankNo;
+
+ @ApiModelProperty(value = "开户行")
+ private String bankName;
// 手机号
@ApiModelProperty(value = "手机号")
private String phone;
+
+ @ApiModelProperty(value = "支行")
+ private String bankNameS;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java
index c434330..d1ca63f 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java
@@ -16,6 +16,9 @@
private String idCardNum;
// 银行卡号
private String bankNo;
+
+ private String bankName;
+ private String bankNameS;
// 手机号
private String phone;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 2dfd91b..8ee5396 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -638,7 +638,9 @@
AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
if(ObjectUtil.isNotEmpty(mallMemberBank)){
adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
- adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
+ adminMallMemberPaymentVo.setName(mallMemberBank.getName());
+ adminMallMemberPaymentVo.setBankName(mallMemberBank.getBankName());
+ adminMallMemberPaymentVo.setBankNameS(mallMemberBank.getBankNameS());
}
return adminMallMemberPaymentVo;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 71b8807..8a1c172 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -618,6 +618,8 @@
mallMemberBank.setIdCardNum(updateMemberBankDto.getIdCardNum());
mallMemberBank.setBankNo(updateMemberBankDto.getBankNo());
mallMemberBank.setPhone(updateMemberBankDto.getPhone());
+ mallMemberBank.setBankName(updateMemberBankDto.getBankName());
+ mallMemberBank.setBankNameS(updateMemberBankDto.getBankNameS());
mallMemberBankMapper.updateById(mallMemberBank);
return new FebsResponse().success();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
index 5645bdf..405ebdc 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
@@ -28,6 +28,8 @@
*/
private String bankName;
+ private String bankNameS;
+
/**
* 银行卡号
*/
@@ -37,4 +39,6 @@
* 开户行
*/
private String bank;
+
+ private String name;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java
index 5f708dc..3270a12 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java
@@ -20,6 +20,10 @@
// 银行卡号
@ApiModelProperty(value = "银行卡号")
private String bankNo;
+ @ApiModelProperty(value = "开户行")
+ private String bankName;
+ @ApiModelProperty(value = "支行")
+ private String bankNameS;
// 手机号
@ApiModelProperty(value = "手机号")
private String phone;
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
index e10c152..aa149d3 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
@@ -63,20 +63,28 @@
<div class="layui-col-lg6">
<label class="layui-form-label">持卡人姓名：</label>
<div class="layui-input-block">
+ <input type="text" name="name" class="layui-input" readonly>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <label class="layui-form-label">银行卡号：</label>
+ <div class="layui-input-block">
+ <input type="text" name="bankNo" class="layui-input" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row layui-col-space10 layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label">开户行：</label>
+ <div class="layui-input-block">
<input type="text" name="bankName" class="layui-input" readonly>
</div>
</div>
-<!-- <div class="layui-col-lg6">-->
-<!-- <label class="layui-form-label">开户行：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="bank" class="layui-input" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">银行卡号：</label>
- <div class="layui-input-block">
- <input type="text" name="bankNo" class="layui-input" readonly>
+ <div class="layui-col-lg6">
+ <label class="layui-form-label">支行：</label>
+ <div class="layui-input-block">
+ <input type="text" name="bankNameS" class="layui-input" readonly>
+ </div>
</div>
</div>
</form>
@@ -109,8 +117,9 @@
// "aliAccount": paymentInfo.aliAccount,
// "aliQrcode": paymentInfo.aliQrcode,
"bankName": paymentInfo.bankName,
+ "bankNameS": paymentInfo.bankNameS,
"bankNo": paymentInfo.bankNo,
- // "bank": paymentInfo.bank
+ "name": paymentInfo.name
});
}
});
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index 7290970..09bb277 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -34,17 +34,17 @@
// @Autowired
// private AgentConsumer agentConsumer;
//
-// @Autowired
-// private IAgentService agentService;
+ @Autowired
+ private IAgentService agentService;
//
// @Autowired
// private IMemberProfitService memberProfitService;
//
-// @Test
-// public void dynamicProfit() {
-//// agentService.returnMoneyToAgent(578L);
+ @Test
+ public void dynamicProfit() {
+ agentService.returnMoneyToAgent(3323L);
// agentService.autoUpAgentLevel(640L);
-// }
+ }
// @Test
// public void agentProfit() {
// memberProfitService.agentProfit(null);
--
Gitblit v1.9.1