Browse Source

销售订单毛利率毛利润保留两位小数

lazhaoqian 4 years ago
parent
commit
0a86c398a5

+ 3 - 3
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -184,10 +184,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				BigDecimal partsPrice = list.stream().reduce(BigDecimal.ZERO,(x,y) ->{
 					return x.add(y.getPartsPrice().multiply(y.getOrderQuantity()));
 				},BigDecimal::add);//配件金额求和
-				orderMessage.setGrossProfit(amount.multiply(order.getExchangeRate()).subtract((purchaseAmount.add(partsPrice))));//毛利额
-				BigDecimal grossProfitRate = new BigDecimal(BigInteger.ZERO);
+				orderMessage.setGrossProfit(amount.multiply(order.getExchangeRate()).subtract((purchaseAmount.add(partsPrice))).setScale(2,BigDecimal.ROUND_HALF_UP));//毛利额
+				BigDecimal grossProfitRate = new BigDecimal(BigInteger.ZERO).setScale(2,BigDecimal.ROUND_HALF_UP);
 				if ((amount.compareTo(BigDecimal.ZERO)) > 0){
-					grossProfitRate = orderMessage.getGrossProfit().divide((purchaseAmount.add(partsPrice)),2).multiply(new BigDecimal(100));
+					grossProfitRate = orderMessage.getGrossProfit().divide((purchaseAmount.add(partsPrice)),2).multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
 				}
 				orderMessage.setGrossProfitRate(grossProfitRate);//毛利率
 			}else {