|
@@ -612,13 +612,13 @@ public class MealOrderService {
|
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
|
|
|
FormatUtil.intShrink100ToStr(orders.stream()
|
|
|
.filter(v -> Checker.getIntegerValue(v.getTotalCostPackageFee()) > 0)
|
|
|
- .mapToInt(v -> Checker.getIntegerValue(v.getPackageFee()))
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getTotalCostPackageFee()))
|
|
|
.sum()), null));
|
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 3, startRows, "包装费成本退款总额", null));
|
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 4, startRows,
|
|
|
FormatUtil.intShrink100ToStr(orders.stream()
|
|
|
.filter(v -> Checker.getIntegerValue(v.getTotalCostPackageFee()) > 0 && RefundStatusEnum.SUCCESS.getValue() == Checker.getIntegerValue(v.getRefundStatus()))
|
|
|
- .mapToInt(v -> Checker.getIntegerValue(v.getPackageFee()))
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getTotalCostPackageFee()))
|
|
|
.sum()), null));
|
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 5, startRows, "包装费实际成本总额", null));
|
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 6, startRows,
|