Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
7d2330f18f
@ -1181,10 +1181,16 @@ public class ShopActivityCutpriceServiceImpl extends BaseServiceImpl<ShopActivit
|
|||||||
pointPrice=achPrice.subtract(oldAchPrice).setScale(4, RoundingMode.HALF_UP);
|
pointPrice=achPrice.subtract(oldAchPrice).setScale(4, RoundingMode.HALF_UP);
|
||||||
} else {
|
} else {
|
||||||
// 自己砍:按百分比计算
|
// 自己砍:按百分比计算
|
||||||
pointPrice = oldAchPrice.multiply(new BigDecimal(point))
|
if(point==1){//没有摇中
|
||||||
.divide(new BigDecimal(10), 4, RoundingMode.HALF_UP)
|
achPrice=oldAchPrice;
|
||||||
.setScale(4, RoundingMode.HALF_UP);
|
pointPrice=BigDecimal.ZERO;
|
||||||
achPrice = oldAchPrice.add(pointPrice);
|
}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);
|
achPrice= BigDecimalFormatter.formatWithoutTrailingZerosBigDecimal(achPrice);
|
||||||
pointPrice= BigDecimalFormatter.formatWithoutTrailingZerosBigDecimal(pointPrice);
|
pointPrice= BigDecimalFormatter.formatWithoutTrailingZerosBigDecimal(pointPrice);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user