Commit 3e2cac4c authored by 周健威's avatar 周健威

修改部分bug

parent 61ba4c3c
...@@ -109,7 +109,6 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> { ...@@ -109,7 +109,6 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
topAmount = BigDecimal.ZERO; topAmount = BigDecimal.ZERO;
} }
BigDecimal refundMainGoodsAmount = originalRefundAmount.subtract(orderDeductAmount); BigDecimal refundMainGoodsAmount = originalRefundAmount.subtract(orderDeductAmount);
refundMainGoodsAmount = refundMainGoodsAmount.setScale(2, RoundingMode.HALF_UP);
//退款金额 = 主要商品退款 + (其他商品退款) 即--> 主要商品退款 + (总商品款 - 主要商品款) //退款金额 = 主要商品退款 + (其他商品退款) 即--> 主要商品退款 + (总商品款 - 主要商品款)
oad.setOrderAmount(refundMainGoodsAmount.add(baseOrder.getGoodsAmount().subtract(mainItemRealAmount))); oad.setOrderAmount(refundMainGoodsAmount.add(baseOrder.getGoodsAmount().subtract(mainItemRealAmount)));
...@@ -132,7 +131,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> { ...@@ -132,7 +131,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
} }
//返回押金 //返回押金
refundAmountDeposit = originalRefundAmount.subtract(orderDeductAmount); refundAmountDeposit = originalRefundAmountDeposit.subtract(depositDeductAmount);
} }
//设置违章款账单 //设置违章款账单
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment