From 1382e80f33270e77e06414ce8ad3f085fde6142a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 21 一月 2026 17:19:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java | 3 ---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/WithdrawRecord.java | 15 +++++++++++----
server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java | 11 +++++++----
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
index 0d5ccb5..7bf1095 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
@@ -37,7 +37,6 @@
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -73,8 +72,6 @@
@ApiModelProperty(value = "閭�璇峰畬鎴愰鍗曞鍔变紭鎯犲埜鍚嶇О 澶氫釜浠�,鍒嗗壊")
@ExcelColumn(name="濂栧姳閭�璇蜂汉浼樻儬鍒�" ,index =6,width = 10 )
private String couponNames;
-
-
@ApiModelProperty(value = "琚個璇蜂汉澶村儚")
@TableField(exist = false)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/WithdrawRecord.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/WithdrawRecord.java
index 65c0c87..d42a88a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/WithdrawRecord.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/WithdrawRecord.java
@@ -67,6 +67,17 @@
@ExcelColumn(name="鎻愮幇閲戦")
private BigDecimal amount;
+ @ApiModelProperty(value = "閾惰鍚嶇О")
+ @ExcelColumn(name="閾惰鍚嶇О")
+ private String bankName;
+
+ @ApiModelProperty(value = "閾惰璐︽埛")
+ @ExcelColumn(name="閾惰璐︽埛")
+ private String bankAccount;
+
+ @ApiModelProperty(value = "寮�鎴蜂汉濮撳悕")
+ @ExcelColumn(name="寮�鎴蜂汉濮撳悕")
+ private String name;
@ApiModelProperty(value = "閾惰涓婚敭锛堝叧鑱� member_bank 琛級", example = "1")
@@ -93,10 +104,6 @@
@ApiModelProperty(value = "鎵撴閾惰")
@ExcelColumn(name="鎵撴閾惰")
private String payBank;
-
- @ApiModelProperty(value = "鎻愮幇閾惰鍚嶇О", example = "1")
- @TableField(exist = false)
- private String bankName;
@ApiModelProperty(value = "鎵撴鍑瘉", example = "1")
@TableField(exist = false)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
index 58e153e..d279e73 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
@@ -109,10 +109,6 @@
if (Objects.isNull(withdrawRecord)) {
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- MemberBank memberBank = memberBankMapper.selectById(withdrawRecord.getBankId());
- if(Objects.nonNull(memberBank)){
- withdrawRecord.setBankName(memberBank.getBankName());
- }
if(!Constants.equalsInteger(withdrawRecord.getStatus(), Constants.ZERO)){
String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OSS, Constants.TRANSFER_FILE).getCode();
@@ -234,6 +230,10 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗘埛浣欓涓嶈冻");
}
+ MemberBank memberBank = memberBankMapper.selectById(request.getBankId());
+ if(Objects.isNull(memberBank)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏀舵閾惰淇℃伅");
+ }
WithdrawRecord withdrawRecord = new WithdrawRecord();
withdrawRecord.setCreateDate(new Date());
withdrawRecord.setIsdeleted(Constants.ZERO);
@@ -243,6 +243,9 @@
withdrawRecord.setMemberId(request.getMemberId());
withdrawRecord.setCode(this.getNextInCode());
withdrawRecord.setStatus(Constants.ZERO);
+ withdrawRecord.setBankName(memberBank.getBankName());
+ withdrawRecord.setName(memberBank.getName());
+ withdrawRecord.setBankAccount(memberBank.getBankAccount());
withdrawRecordMapper.insert(withdrawRecord);
DealIntegralRequest dealIntegralRequest = new DealIntegralRequest();
--
Gitblit v1.9.3