From 297734ace4c05848b28a792fa89f38bee67be3c1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 09:41:34 +0800
Subject: [PATCH] 合并
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
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 3e0af81..262523f 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
@@ -134,7 +134,7 @@
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.WITHDRAW_APPLY_BACK);
dealIntegralRequest.setIntegralNum(model.getAmount());
dealIntegralRequest.setObjId(withdrawRecord.getId());
- dealIntegralRequest.setOrderCode(withdrawRecord.getCode().toString());
+ dealIntegralRequest.setOrderCode(withdrawRecord.getCode()!=null?withdrawRecord.getCode().toString():"");
dealIntegralRequest.setMemberId(model.getMemberId());
dealIntegralRequest.setDealType(Constants.ZERO);
integralService.dealShopAmount(dealIntegralRequest);
@@ -186,6 +186,7 @@
if (Objects.isNull(withdrawRecord) ) {
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ withdrawRecord.setBankInfo(Constants.getBankInfo(withdrawRecord.getBankName(),withdrawRecord.getBankAccount()));
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();
@@ -315,7 +316,7 @@
@Override
- public void withdrawApply(WithdrawApplyRequest request, IntegralService integralService){
+ public Integer withdrawApply(WithdrawApplyRequest request, IntegralService integralService){
if (Objects.isNull( request)
|| request.getMemberId() == null
|| request.getBankId() == null
@@ -357,6 +358,7 @@
dealIntegralRequest.setMemberId(request.getMemberId());
dealIntegralRequest.setDealType(Constants.ONE);
integralService.dealShopAmount(dealIntegralRequest);
+ return withdrawRecord.getId();
}
--
Gitblit v1.9.3