From 75df6a24a363a58a047c2e1f3354227e0bdf07ab Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 23 May 2019 16:02:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=88=E5=90=8C=E9=9C=80=E6=B1=82]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 7 ++++++- .../iformall/service/impl/WxRentContractServiceImpl.java | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index fe0df2be4..cbb8e18fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -484,7 +484,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService double priceD = price; for (int i = 1; i < size; i++) { priceD = priceD + priceD * integers.get(i) / 10000.0; - priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue(); + //年 需要除12 + if(EnumPriceUnit.Y.getCode().equals(wxPropertyContract.getPriceUnit())){ + priceArr[i] = new BigDecimal(priceD).divide(new BigDecimal(12),2, BigDecimal.ROUND_HALF_DOWN).setScale(0, RoundingMode.HALF_EVEN).longValue(); + }else{ + priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue(); + } } int month = 12; int divide = lease / month; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index d9a9c7640..9e6660f85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -747,7 +747,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { }else{ priceArr[i] = new BigDecimal(rentInfoObject.getString("price")).multiply(new BigDecimal(100)).longValue(); } - } priceList.add(priceArr); //大于一年