From 7e03e6abb11ef40df75827eca5eb9b512f9836bb Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 30 八月 2024 15:11:44 +0800
Subject: [PATCH] 1.优惠券-用户：详情返回商户信息
---
src/main/java/com/mzl/flower/service/BaseService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/BaseService.java b/src/main/java/com/mzl/flower/service/BaseService.java
index f6cca5b..bd1d2cb 100644
--- a/src/main/java/com/mzl/flower/service/BaseService.java
+++ b/src/main/java/com/mzl/flower/service/BaseService.java
@@ -113,10 +113,10 @@
}
if (platformSalesMap != null) {
- BigDecimal feePlatform = s.getFeePlatform();
- BigDecimal feePlatformPack = s.getFeePlatformPack();
- BigDecimal feePlatformCheck = s.getFeePlatformCheck();
- BigDecimal feePlatformTransport = s.getFeePlatformTransport();
+ BigDecimal feePlatform = getAmount(s.getFeePlatform());
+ BigDecimal feePlatformPack = getAmount(s.getFeePlatformPack());
+ BigDecimal feePlatformCheck = getAmount(s.getFeePlatformCheck());
+ BigDecimal feePlatformTransport = getAmount(s.getFeePlatformTransport());
BigDecimal b = platformSalesMap.get(orderItemId);
if (b == null) {
@@ -127,6 +127,10 @@
}
}
+ protected BigDecimal getAmount(BigDecimal amount){
+ return amount == null ? new BigDecimal(0) : amount;
+ }
+
protected void prepareSalesAmount(OrderSalesItem s
, Map<String, BigDecimal> supplierSalesMap
, Map<String, BigDecimal> partnerSalesMap
--
Gitblit v1.9.3