|
|
@@ -225,7 +225,7 @@ 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((purchaseAmount.add(partsPrice)),2).multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
+ grossProfitRate = orderMessage.getGrossProfit().divide(amount,2).multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
orderMessage.setGrossProfitRate(grossProfitRate);//毛利率
|
|
|
}else {
|