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; } } }