台桌统计
This commit is contained in:
@@ -33,8 +33,8 @@ public class TableSummaryExportVo implements Serializable {
|
||||
/**
|
||||
* 台桌+日期
|
||||
*/
|
||||
@ExcelIgnore
|
||||
private String tableConcatDate;
|
||||
// @ExcelIgnore
|
||||
// private String tableConcatDate;
|
||||
/**
|
||||
* 台桌
|
||||
*/
|
||||
@@ -80,27 +80,27 @@ public class TableSummaryExportVo implements Serializable {
|
||||
/**
|
||||
* 单价
|
||||
*/
|
||||
@ExcelProperty("单价")
|
||||
@ColumnWidth(10)
|
||||
private BigDecimal unitPrice;
|
||||
/**
|
||||
* 金额
|
||||
*/
|
||||
@ExcelProperty("金额")
|
||||
@ColumnWidth(10)
|
||||
private BigDecimal amount;
|
||||
// @ExcelProperty("单价")
|
||||
// @ColumnWidth(10)
|
||||
// private BigDecimal unitPrice;
|
||||
// /**
|
||||
// * 金额
|
||||
// */
|
||||
// @ExcelProperty("金额")
|
||||
// @ColumnWidth(10)
|
||||
// private BigDecimal amount;
|
||||
/**
|
||||
* 销售额
|
||||
*/
|
||||
@ExcelProperty("销售额")
|
||||
@ColumnWidth(10)
|
||||
private BigDecimal salesAmount;
|
||||
/**
|
||||
* 总销售额
|
||||
*/
|
||||
@ExcelProperty("总销售额")
|
||||
@ColumnWidth(15)
|
||||
private BigDecimal totalSalesAmount;
|
||||
// /**
|
||||
// * 总销售额
|
||||
// */
|
||||
// @ExcelProperty("总销售额")
|
||||
// @ColumnWidth(15)
|
||||
// private BigDecimal totalSalesAmount;
|
||||
/**
|
||||
* 退单量
|
||||
*/
|
||||
|
||||
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -51,24 +52,6 @@ public class TableSummaryServiceImpl implements TableSummaryService {
|
||||
if (CollUtil.isEmpty(list)) {
|
||||
return List.of();
|
||||
}
|
||||
Map<String, BigDecimal> totalSalesAmountMap = list.stream().collect(
|
||||
Collectors.groupingBy(
|
||||
TableSummaryExportVo::getTableName, Collectors.reducing(BigDecimal.ZERO,
|
||||
TableSummaryExportVo::getAmount,
|
||||
BigDecimal::add)
|
||||
)
|
||||
);
|
||||
Map<String, BigDecimal> salesAmountMap = list.stream().collect(
|
||||
Collectors.groupingBy(
|
||||
TableSummaryExportVo::getTableConcatDate, Collectors.reducing(BigDecimal.ZERO,
|
||||
TableSummaryExportVo::getAmount,
|
||||
BigDecimal::add)
|
||||
)
|
||||
);
|
||||
list.parallelStream().forEach(data -> {
|
||||
data.setSalesAmount(salesAmountMap.get(data.getTableConcatDate()));
|
||||
data.setTotalSalesAmount(totalSalesAmountMap.get(data.getTableName()));
|
||||
});
|
||||
// 追加个空行用于处理表格样式
|
||||
TableSummaryExportVo nullVo = new TableSummaryExportVo();
|
||||
list.add(nullVo);
|
||||
|
||||
@@ -5,49 +5,32 @@
|
||||
<mapper namespace="com.czg.service.order.mapper.ShopTableOrderStatisticMapper">
|
||||
|
||||
<select id="findSummaryExportList" resultType="com.czg.order.vo.TableSummaryExportVo">
|
||||
SELECT
|
||||
t.product_name,
|
||||
date_format(t.create_time, '%Y-%m-%d') as create_date,
|
||||
if(t.table_name = 'NONE','银收客',t.table_name) as table_name,
|
||||
concat(if(t.table_name = 'NONE','银收客',t.table_name),'-',date_format(t.create_time, '%Y-%m-%d')) as tableConcatDate,
|
||||
t.category_name,
|
||||
t.unit_name,
|
||||
group_concat(distinct t.sku_name SEPARATOR ';') as sku_name,
|
||||
sum(t.num) as num,
|
||||
avg(t.unit_price) as unit_price,
|
||||
sum(t.num*t.unit_price) as amount,
|
||||
sum(-t.refund_num) as refund_num,
|
||||
sum(-t.refund_num*t.unit_price) as refund_amount
|
||||
FROM
|
||||
(
|
||||
SELECT
|
||||
t1.product_id,
|
||||
t2.table_code,
|
||||
IF(t2.table_code is null or t2.table_code = '' or t6.NAME is null, 'NONE', t6.NAME) AS table_name,
|
||||
t1.create_time,
|
||||
t4.NAME AS category_name,
|
||||
t3.name as product_name,
|
||||
t5.NAME AS unit_name,
|
||||
t1.sku_name,
|
||||
t1.num,
|
||||
t1.unit_price,
|
||||
t1.refund_num as refund_num
|
||||
FROM
|
||||
tb_order_detail t1
|
||||
LEFT JOIN tb_order_info t2 ON t1.order_id = t2.id
|
||||
LEFT JOIN tb_product t3 ON t1.product_id = t3.id
|
||||
LEFT JOIN tb_shop_prod_category t4 ON t3.category_id = t4.id
|
||||
LEFT JOIN tb_shop_prod_unit t5 ON t3.unit_id = t5.id
|
||||
LEFT JOIN tb_shop_table t6 ON t2.table_code = t6.table_code AND t1.shop_id = t6.shop_id and t6.table_code != '' and t6.table_code is not null
|
||||
WHERE t1.shop_id = #{shopId}
|
||||
<if test="beginDate != null and beginDate != ''">
|
||||
AND t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
|
||||
</if>
|
||||
<if test="endDate != null and endDate != ''">
|
||||
and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
|
||||
</if>
|
||||
) t
|
||||
group by t.product_id,date_format(t.create_time, '%Y-%m-%d'),t.table_name
|
||||
order by t.table_name,t.table_code,date_format(t.create_time, '%Y-%m-%d'),t.category_name,t.product_id
|
||||
SELECT `order`.table_code,
|
||||
`order`.trade_day as create_date,
|
||||
IF(`order`.table_code IS NULL OR `order`.table_code = '' OR `table`.NAME IS NULL, '吧台',
|
||||
`table`.NAME) AS table_name,
|
||||
category.`name` AS category_name,
|
||||
product.`name` AS product_name,
|
||||
unit.`name` AS unit_name,
|
||||
detail.sku_name,
|
||||
sum(detail.num - detail.return_num) AS num,
|
||||
sum(detail.pay_amount) AS salesAmount,
|
||||
sum(detail.refund_num) AS refund_num,
|
||||
sum(detail.return_amount) AS refund_amount
|
||||
FROM tb_order_info `order`
|
||||
INNER JOIN tb_order_detail detail ON detail.order_id = `order`.id
|
||||
AND detail.is_temporary = 0
|
||||
LEFT JOIN tb_product product ON detail.product_id = product.id
|
||||
LEFT JOIN tb_shop_prod_category category ON product.category_id = category.id
|
||||
LEFT JOIN tb_shop_prod_unit unit ON product.unit_id = unit.id
|
||||
LEFT JOIN tb_shop_table `table`
|
||||
ON `order`.table_code = `table`.table_code AND `order`.shop_id = `table`.shop_id
|
||||
AND `table`.table_code != '' AND `table`.table_code IS NOT NULL
|
||||
WHERE `order`.shop_id = #{shopId}
|
||||
AND `order`.paid_time IS NOT NULL
|
||||
AND `order`.pay_mode != 'no-table'
|
||||
AND `order`.trade_day >= #{beginDate}
|
||||
AND `order`.trade_day <= #{endDate}
|
||||
group by `order`.trade_day, `order`.table_code, detail.product_id
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user