From f1488d62d761c648424d86112a465ead3a924148 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 12 Apr 2023 16:55:58 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java | 2 ++
src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html | 9 +++++++++
src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java | 2 ++
src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 5 ++++-
src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java | 3 +++
src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java | 3 +++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 1 +
9 files changed, 27 insertions(+), 1 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 a7ca2a2..3048b5a 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java
@@ -29,5 +29,8 @@
// 开户行
@ApiModelProperty(value = "开户行")
private String bankName;
+ // 开户行
+ @ApiModelProperty(value = "支行")
+ private String subbranchName;
}
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 f722635..29f30df 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java
@@ -31,4 +31,6 @@
// 开户行
@ApiModelProperty(value = "开户行")
private String bankName;
+ @ApiModelProperty(value = "支行")
+ private String subbranchName;
}
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 93024a7..ef713d4 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java
@@ -19,6 +19,8 @@
private String bankName;
+ private String subbranchName;
+
private String digitalNo;
// 手机号
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 4890199..64bbfe9 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
@@ -654,6 +654,7 @@
adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
adminMallMemberPaymentVo.setDigitalNo(mallMemberBank.getDigitalNo());
+ adminMallMemberPaymentVo.setSubbranchName(mallMemberBank.getSubbranchName());
adminMallMemberPaymentVo.setBank(mallMemberBank.getBankName());
}
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 f835945..2cb8174 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
@@ -628,6 +628,7 @@
mallMemberBank.setPhone(updateMemberBankDto.getPhone());
mallMemberBank.setDigitalNo(updateMemberBankDto.getDigitalNo());
mallMemberBank.setBankName(updateMemberBankDto.getBankName());
+ mallMemberBank.setSubbranchName(updateMemberBankDto.getSubbranchName());
mallMemberBankMapper.updateById(mallMemberBank);
return new FebsResponse().success();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
index 362310b..dc79812 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
@@ -73,7 +73,10 @@
throw new FebsException("未找到银行卡信息");
}
if(ObjectUtil.isEmpty(mallMemberBank.getBankName())){
- throw new FebsException("请填写开户银行名称");
+ throw new FebsException("请填写所属银行");
+ }
+ if(ObjectUtil.isEmpty(mallMemberBank.getSubbranchName())){
+ throw new FebsException("请填写所属支行");
}
if(ObjectUtil.isEmpty(mallMemberBank.getDigitalNo())){
throw new FebsException("请填写数字货币账号");
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 684be37..978a42a 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
@@ -42,4 +42,6 @@
* 数字账号
*/
private String digitalNo;
+
+ private String subbranchName;
}
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 b385614..f79e9f6 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java
@@ -29,4 +29,7 @@
// 开户行
@ApiModelProperty(value = "开户行")
private String bankName;
+
+ @ApiModelProperty(value = "支行")
+ private String subbranchName;
}
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 0923db4..77b4dc8 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
@@ -66,10 +66,18 @@
<input type="text" name="bankName" 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="bank" 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="subbranchName" class="layui-input" readonly>
</div>
</div>
</div>
@@ -115,6 +123,7 @@
// "aliAccount": paymentInfo.aliAccount,
// "aliQrcode": paymentInfo.aliQrcode,
"bankName": paymentInfo.bankName,
+ "subbranchName": paymentInfo.subbranchName,
"bankNo": paymentInfo.bankNo,
"digitalNo": paymentInfo.digitalNo,
"bank": paymentInfo.bank
--
Gitblit v1.9.1