From 26f02dfa804f9b74dca63790f79ce0b67ab0780c Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 22 Apr 2025 15:47:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E4=BB=B7=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/model/db/PriceResult.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/model/db/PriceResult.java b/src/main/java/mjkf/xinke/main/model/db/PriceResult.java index 26f4b1b..d51054d 100644 --- a/src/main/java/mjkf/xinke/main/model/db/PriceResult.java +++ b/src/main/java/mjkf/xinke/main/model/db/PriceResult.java @@ -193,15 +193,20 @@ public class PriceResult extends Model { } public void refreshWeight() { + // 浮动 var fluctuatingSum = fluctuatingFtb * weightFtb + fluctuatingSs * weightSs + fluctuatingFhb * weightFhb + fluctuatingNetwork * weightNetwork + fluctuatingSurvey * weightSurvey; var weight = weightFtb + weightSs + weightFhb + weightNetwork + weightSurvey; var fluctuatingWeightedMean = fluctuatingSum / weight; - - fluctuatingRecommend = fluctuatingWeightedMean; + // 计算价 + var priceSum = priceFtb * weightFtb + priceSs * weightSs + priceFhb * weightFhb + priceNetwork * weightNetwork + priceSurvey * weightSurvey; + var priceWeightedMean = priceSum / weight; + this.priceCalculate = priceWeightedMean; + // 推荐价 + this.fluctuatingRecommend = fluctuatingWeightedMean; if (priceLastMonth.equals(0f) || ObjectUtil.isEmpty(priceLastMonth)) { - priceRecommend = priceCalculate + fluctuatingRecommend; + this.priceRecommend = priceCalculate + fluctuatingRecommend; } else { - priceRecommend = priceLastMonth + fluctuatingRecommend; + this.priceRecommend = priceLastMonth + fluctuatingRecommend; } } }