From 3f2e0142a6db9720f6429848840ac6b214a1cd1b Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 17 十月 2023 15:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 687d62b..d3642d2 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -835,7 +835,7 @@
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
} else {
- commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
commodity.setAmount(vicinityGood.getCash());
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
@@ -869,7 +869,7 @@
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
} else {
- commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
commodity.setAmount(vicinityGood.getCash());
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
--
Gitblit v1.7.1