Commit 6d72472b authored by jiaorz's avatar jiaorz

发票

parent 76d14f55
......@@ -797,17 +797,17 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
return mapper.selectByExample(example);
}
public BigDecimal getAllOrderCost(Integer orderId) {
public double getAllOrderCost(Integer orderId) {
List<OrderAccount> list = getByOrderId(orderId);
BigDecimal bigDecimal = new BigDecimal("0");
double amount = 0;
if (list != null && list.size() > 0) {
for (OrderAccount orderAccount : list) {
if(orderAccount.getAccountAmount() != null && orderAccount.getAccountStatus() == 1) {
bigDecimal.add(orderAccount.getAccountAmount());
amount += orderAccount.getAccountAmount().doubleValue();
}
}
log.info("bigDecimal: {}", bigDecimal);
log.info("amount: {}", amount);
}
return bigDecimal;
return amount;
}
}
\ No newline at end of file
......@@ -91,10 +91,11 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
if (baseOrder.getType() == OrderTypeEnum.MEMBER.getCode()) {
orderData.setOrderName(OrderTypeEnum.MEMBER.getDesc());
}
BigDecimal cost = orderAccountBiz.getAllOrderCost(baseOrder.getId());
double cost = orderAccountBiz.getAllOrderCost(baseOrder.getId());
log.info("{}退款费用总计:{}",baseOrder.getNo(), cost);
log.info("{}订单实际金额:{}", baseOrder.getNo(), baseOrder.getRealAmount());
orderData.setPrice(baseOrder.getRealAmount().subtract(cost));
BigDecimal bigDecimal = new BigDecimal(baseOrder.getRealAmount().doubleValue() - cost);
orderData.setPrice(bigDecimal);
log.info("{}用户实际支付金额: {}", baseOrder.getNo(), orderData.getPrice());
list.add(orderData);
continue;
......
......@@ -194,7 +194,9 @@ public class BaseOrderController extends CommonBaseController implements UserRes
PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
pages.getData().parallelStream().forEach(data -> {
data.setQrcodeStr(qrcodePrefix);
data.setOrderRealAmount(data.getRealAmount().subtract(orderAccountBiz.getAllOrderCost(data.getId())));
BigDecimal bigDecimal = new BigDecimal(data.getRealAmount().doubleValue()-orderAccountBiz.getAllOrderCost(data.getId()));
data.setOrderRealAmount(bigDecimal);
log.info("订单实际支付金额,扣除押金违章之后: {}", data.getOrderRealAmount());
});
return new ObjectRestResponse<>().data(pages);
......
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