Merge remote-tracking branch 'origin/main'

This commit is contained in:
Jack 2025-12-12 15:39:09 +08:00
commit 7d2330f18f

View File

@ -1181,10 +1181,16 @@ public class ShopActivityCutpriceServiceImpl extends BaseServiceImpl<ShopActivit
pointPrice=achPrice.subtract(oldAchPrice).setScale(4, RoundingMode.HALF_UP);
} else {
// 自己砍按百分比计算
pointPrice = oldAchPrice.multiply(new BigDecimal(point))
.divide(new BigDecimal(10), 4, RoundingMode.HALF_UP)
.setScale(4, RoundingMode.HALF_UP);
achPrice = oldAchPrice.add(pointPrice);
if(point==1){//没有摇中
achPrice=oldAchPrice;
pointPrice=BigDecimal.ZERO;
}else {
pointPrice = oldAchPrice.multiply(new BigDecimal(point))
.divide(new BigDecimal(10), 4, RoundingMode.HALF_UP)
.setScale(4, RoundingMode.HALF_UP);
achPrice = oldAchPrice.add(pointPrice);
}
}
achPrice= BigDecimalFormatter.formatWithoutTrailingZerosBigDecimal(achPrice);
pointPrice= BigDecimalFormatter.formatWithoutTrailingZerosBigDecimal(pointPrice);