wangyingyang

fix

...@@ -422,6 +422,9 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -422,6 +422,9 @@ public class SettlementServiceImpl implements SettlementService {
422 .filter(o -> Objects.equals(DateUtil.formatDateOfUtc(o.getCreatedAt(), DateUtil.YYYY_MM_DD_UTC), date)) 422 .filter(o -> Objects.equals(DateUtil.formatDateOfUtc(o.getCreatedAt(), DateUtil.YYYY_MM_DD_UTC), date))
423 .collect(Collectors.toList()); 423 .collect(Collectors.toList());
424 for(SingleClientCustomerOrderDetailRpcResponse detail: curMealDateOrderDetails) { 424 for(SingleClientCustomerOrderDetailRpcResponse detail: curMealDateOrderDetails) {
425 + if (detail.getServeStatus().equals(ServeStatusEnum.SERVE_REJECT)) {
426 + continue;
427 + }
425 final var settlementOrderDetail = SettlementMenuMealDto.builder() 428 final var settlementOrderDetail = SettlementMenuMealDto.builder()
426 .skuName(detail.getShowName()) 429 .skuName(detail.getShowName())
427 .count(detail.getCount()) 430 .count(detail.getCount())
...@@ -519,9 +522,9 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -519,9 +522,9 @@ public class SettlementServiceImpl implements SettlementService {
519 if(!toWriteDateSkuList.isEmpty()) { 522 if(!toWriteDateSkuList.isEmpty()) {
520 for (SettlementMenuMealDto settlementMenuMealDto: toWriteDateSkuList) { 523 for (SettlementMenuMealDto settlementMenuMealDto: toWriteDateSkuList) {
521 price += settlementMenuMealDto.getPrice() * settlementMenuMealDto.getCount(); 524 price += settlementMenuMealDto.getPrice() * settlementMenuMealDto.getCount();
522 - totalPrice += price;
523 } 525 }
524 } 526 }
527 + totalPrice += price;
525 Cell priceCell = mealRow.createCell(columnNum++); 528 Cell priceCell = mealRow.createCell(columnNum++);
526 priceCell.setCellValue((double)price/100); 529 priceCell.setCellValue((double)price/100);
527 } 530 }
......