Commit a5858dae authored by unset's avatar unset

添加通知信息

parent aa07254d
...@@ -364,7 +364,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> { ...@@ -364,7 +364,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue()))); amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue())));
//下单后删除购物车 //下单后删除购物车
shoppingCartInfo.setIsDel(1); shoppingCartInfo.setIsDel(1);
shoppingCartInfoBiz.updateSelectiveByIdRe(shoppingCartInfo); shoppingCartInfoBiz.delete(shoppingCartInfo);
} }
break; break;
default: default:
......
...@@ -130,7 +130,6 @@ public class ConfirmOrderService { ...@@ -130,7 +130,6 @@ public class ConfirmOrderService {
} }
} }
} }
if (itemInfoDto.getType().equals(OrderTypeEnum.SHOPPING_CART_INFO.getType())) { if (itemInfoDto.getType().equals(OrderTypeEnum.SHOPPING_CART_INFO.getType())) {
ShoppingCartInfo shoppingCartInfo = shoppingCartInfoBiz.selectById(itemInfoDto.getId()); ShoppingCartInfo shoppingCartInfo = shoppingCartInfoBiz.selectById(itemInfoDto.getId());
if (shoppingCartInfo != null) { if (shoppingCartInfo != null) {
...@@ -149,7 +148,7 @@ public class ConfirmOrderService { ...@@ -149,7 +148,7 @@ public class ConfirmOrderService {
} }
} }
}); });
confirmOrderInfoVo.setTotalAmount(new BigDecimal(amount.get())); confirmOrderInfoVo.setTotalAmount(new BigDecimal(amount.get()).setScale(2, BigDecimal.ROUND_HALF_UP));
confirmOrderInfoVo.setNumber(number.get()); confirmOrderInfoVo.setNumber(number.get());
confirmOrderInfoVo.setItemInfoVoList(itemInfoVoList); confirmOrderInfoVo.setItemInfoVoList(itemInfoVoList);
} }
...@@ -160,7 +159,7 @@ public class ConfirmOrderService { ...@@ -160,7 +159,7 @@ public class ConfirmOrderService {
confirmOrderInfoVo.setFee(new BigDecimal(dictionary.getDetail())); confirmOrderInfoVo.setFee(new BigDecimal(dictionary.getDetail()));
} }
if (confirmOrderInfoVo.getFee() != null) { if (confirmOrderInfoVo.getFee() != null) {
confirmOrderInfoVo.setActAmount(confirmOrderInfoVo.getTotalAmount().add(confirmOrderInfoVo.getFee())); confirmOrderInfoVo.setActAmount(confirmOrderInfoVo.getTotalAmount().add(confirmOrderInfoVo.getFee()).setScale(2, BigDecimal.ROUND_HALF_UP));
} }
return ObjectRestResponse.succ(confirmOrderInfoVo); return ObjectRestResponse.succ(confirmOrderInfoVo);
} }
......
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