金额问题
This commit is contained in:
@@ -84,8 +84,8 @@
|
|||||||
SELECT
|
SELECT
|
||||||
sum(detail.num-detail.return_num) as saleCount,
|
sum(detail.num-detail.return_num) as saleCount,
|
||||||
sum(detail.pay_amount) as totalAmount,
|
sum(detail.pay_amount) as totalAmount,
|
||||||
sum(detail.refund_num) refundCount,
|
sum(detail.refund_num) as refundCount,
|
||||||
sum(detail.return_amount) refundAmount
|
sum(detail.return_amount) as refundAmount
|
||||||
FROM
|
FROM
|
||||||
tb_order_info `order`
|
tb_order_info `order`
|
||||||
INNER JOIN tb_order_detail detail ON `order`.id = detail.order_id
|
INNER JOIN tb_order_detail detail ON `order`.id = detail.order_id
|
||||||
@@ -104,7 +104,7 @@
|
|||||||
<select id="summaryCountSingleDate" resultType="com.czg.order.vo.SaleSummaryCountVo">
|
<select id="summaryCountSingleDate" resultType="com.czg.order.vo.SaleSummaryCountVo">
|
||||||
SELECT
|
SELECT
|
||||||
sum(statistic.sale_count) AS saleCount,
|
sum(statistic.sale_count) AS saleCount,
|
||||||
sum(statistic.sale_amount) AS saleAmount,
|
sum(statistic.sale_amount) AS totalAmount,
|
||||||
sum(statistic.refund_count) AS refundCount,
|
sum(statistic.refund_count) AS refundCount,
|
||||||
sum(statistic.refund_amount) AS refundAmount
|
sum(statistic.refund_amount) AS refundAmount
|
||||||
FROM
|
FROM
|
||||||
|
|||||||
@@ -158,7 +158,6 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
|
|||||||
stockPrint.setPrintTime(LocalDateTime.now());
|
stockPrint.setPrintTime(LocalDateTime.now());
|
||||||
stockPrint.setInStockTime(LocalDateTime.now());
|
stockPrint.setInStockTime(LocalDateTime.now());
|
||||||
stockPrint.setOperator(param.getOperator());
|
stockPrint.setOperator(param.getOperator());
|
||||||
stockPrint.setConsCount(param.getBodyList().size());
|
|
||||||
List<StockPrintDTO.InStockItem> items = new ArrayList<>();
|
List<StockPrintDTO.InStockItem> items = new ArrayList<>();
|
||||||
BigDecimal totalInOutNumber = BigDecimal.ZERO;
|
BigDecimal totalInOutNumber = BigDecimal.ZERO;
|
||||||
BigDecimal totalAmount = BigDecimal.ZERO;
|
BigDecimal totalAmount = BigDecimal.ZERO;
|
||||||
@@ -175,6 +174,7 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
|
|||||||
totalInOutNumber = NumberUtil.add(totalInOutNumber, cons.getInOutNumber());
|
totalInOutNumber = NumberUtil.add(totalInOutNumber, cons.getInOutNumber());
|
||||||
totalAmount = NumberUtil.add(totalAmount, cons.getSubTotal());
|
totalAmount = NumberUtil.add(totalAmount, cons.getSubTotal());
|
||||||
}
|
}
|
||||||
|
stockPrint.setConsCount(items.size());
|
||||||
stockPrint.setStockNumberCount(totalInOutNumber);
|
stockPrint.setStockNumberCount(totalInOutNumber);
|
||||||
stockPrint.setAmountCount(totalAmount);
|
stockPrint.setAmountCount(totalAmount);
|
||||||
stockPrint.setItems(items);
|
stockPrint.setItems(items);
|
||||||
|
|||||||
Reference in New Issue
Block a user