From 40302884d40c2daceb291ca793a580988427f372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 23 九月 2021 12:06:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wangfy-dev'
---
service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java b/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
old mode 100644
new mode 100755
index e60b2ed..e594b4a
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
@@ -27,6 +27,7 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
/**
* 浼樻儬鎵撴姌 瑙勫垯
@@ -90,9 +91,9 @@
feeDto.setFeeId(feeDiscountDto.getFeeId());
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- double price = computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
+ Map feePriceAll=computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
- BigDecimal priceDec = new BigDecimal(price);
+ BigDecimal priceDec = new BigDecimal(feePriceAll.get("feePrice").toString());
BigDecimal cycleDec = new BigDecimal(feeDiscountDto.getCycles());
--
Gitblit v1.8.0