From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 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 74f27d5..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);
--
Gitblit v1.9.3