lazhaoqian 3 år sedan
förälder
incheckning
a57011e2ac

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

@@ -235,7 +235,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				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(amount,2).multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
+					BigDecimal multiply = amount.multiply(order.getExchangeRate());
+					grossProfitRate = orderMessage.getGrossProfit().divide(multiply,2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
 				}
 				orderMessage.setGrossProfitRate(grossProfitRate);//毛利率
 			}else {