wangyingyang

fix

......@@ -422,6 +422,9 @@ public class SettlementServiceImpl implements SettlementService {
.filter(o -> Objects.equals(DateUtil.formatDateOfUtc(o.getCreatedAt(), DateUtil.YYYY_MM_DD_UTC), date))
.collect(Collectors.toList());
for(SingleClientCustomerOrderDetailRpcResponse detail: curMealDateOrderDetails) {
if (detail.getServeStatus().equals(ServeStatusEnum.SERVE_REJECT)) {
continue;
}
final var settlementOrderDetail = SettlementMenuMealDto.builder()
.skuName(detail.getShowName())
.count(detail.getCount())
......@@ -519,9 +522,9 @@ public class SettlementServiceImpl implements SettlementService {
if(!toWriteDateSkuList.isEmpty()) {
for (SettlementMenuMealDto settlementMenuMealDto: toWriteDateSkuList) {
price += settlementMenuMealDto.getPrice() * settlementMenuMealDto.getCount();
totalPrice += price;
}
}
totalPrice += price;
Cell priceCell = mealRow.createCell(columnNum++);
priceCell.setCellValue((double)price/100);
}
......