|
@@ -511,7 +511,7 @@ public class MealOrderService {
|
|
.filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
.filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getOrderAmount()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getOrderAmount()))
|
|
.sum()), null));
|
|
.sum()), null));
|
|
- customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "总成本", null));
|
|
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "菜品成本总额", null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, allCost, null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, allCost, null));
|
|
startRows += 1;
|
|
startRows += 1;
|
|
// 微信支付
|
|
// 微信支付
|
|
@@ -532,7 +532,7 @@ public class MealOrderService {
|
|
.filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
.filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getWechatPayAmount()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getWechatPayAmount()))
|
|
.sum()), null));
|
|
.sum()), null));
|
|
- customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "微信点单成本", null));
|
|
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "菜品微信点单成本", null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, wechatSinglePointCost, null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, wechatSinglePointCost, null));
|
|
startRows += 1;
|
|
startRows += 1;
|
|
// 金币支付
|
|
// 金币支付
|
|
@@ -553,7 +553,7 @@ public class MealOrderService {
|
|
.filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
.filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getCoinPayAmount()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getCoinPayAmount()))
|
|
.sum()), null));
|
|
.sum()), null));
|
|
- customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "金币点单成本", null));
|
|
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "菜品金币点单成本", null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, coinSinglePointCost, null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, coinSinglePointCost, null));
|
|
startRows += 1;
|
|
startRows += 1;
|
|
// 现场支付
|
|
// 现场支付
|
|
@@ -574,7 +574,7 @@ public class MealOrderService {
|
|
.filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
.filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getF2fPayAmount()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getF2fPayAmount()))
|
|
.sum()), null));
|
|
.sum()), null));
|
|
- customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "现场点单成本", null));
|
|
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "菜品现场点单成本", null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, p2fSinglePointCost, null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, p2fSinglePointCost, null));
|
|
startRows += 1;
|
|
startRows += 1;
|
|
// 洗碗费
|
|
// 洗碗费
|
|
@@ -595,6 +595,37 @@ public class MealOrderService {
|
|
.filter(v -> Checker.getIntegerValue(v.getPackageFee()) > 0)
|
|
.filter(v -> Checker.getIntegerValue(v.getPackageFee()) > 0)
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getPackageFee()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getPackageFee()))
|
|
.sum()), null));
|
|
.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.getPackageFee()) > 0 && RefundStatusEnum.SUCCESS.getValue() == Checker.getIntegerValue(v.getRefundStatus()))
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getPackageFee()))
|
|
|
|
+ .sum()), null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 5, startRows, "包装费实际支付总额", null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 6, startRows,
|
|
|
|
+ FormatUtil.intShrink100ToStr(orders.stream()
|
|
|
|
+ .filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getPackageFee()))
|
|
|
|
+ .sum()), null));
|
|
|
|
+ startRows += 1;
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 1, startRows, "包装费成本总额", null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
|
|
|
|
+ FormatUtil.intShrink100ToStr(orders.stream()
|
|
|
|
+ .filter(v -> Checker.getIntegerValue(v.getTotalCostPackageFee()) > 0)
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getPackageFee()))
|
|
|
|
+ .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()))
|
|
|
|
+ .sum()), null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 5, startRows, "包装费实际成本总额", null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 6, startRows,
|
|
|
|
+ FormatUtil.intShrink100ToStr(orders.stream()
|
|
|
|
+ .filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getTotalCostPackageFee()))
|
|
|
|
+ .sum()), null));
|
|
startRows += 1;
|
|
startRows += 1;
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 1, startRows, "配送费总额", null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 1, startRows, "配送费总额", null));
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
|
|
customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
|
|
@@ -602,6 +633,37 @@ public class MealOrderService {
|
|
.filter(v -> Checker.getIntegerValue(v.getDeliveryFee()) > 0)
|
|
.filter(v -> Checker.getIntegerValue(v.getDeliveryFee()) > 0)
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getDeliveryFee()))
|
|
.mapToInt(v -> Checker.getIntegerValue(v.getDeliveryFee()))
|
|
.sum()), null));
|
|
.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.getDeliveryFee()) > 0 && RefundStatusEnum.SUCCESS.getValue() == Checker.getIntegerValue(v.getRefundStatus()))
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getDeliveryFee()))
|
|
|
|
+ .sum()), null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 5, startRows, "配送费实际支付总额", null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 6, startRows,
|
|
|
|
+ FormatUtil.intShrink100ToStr(orders.stream()
|
|
|
|
+ .filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getDeliveryFee()))
|
|
|
|
+ .sum()), null));
|
|
|
|
+ startRows += 1;
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 1, startRows, "总额(做法-加料)", null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
|
|
|
|
+ FormatUtil.intShrink100ToStr(orders.stream()
|
|
|
|
+ .filter(v -> Checker.getIntegerValue(v.getSpecPrice()) > 0)
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getSpecPrice()))
|
|
|
|
+ .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.getSpecPrice()) > 0 && RefundStatusEnum.SUCCESS.getValue() == Checker.getIntegerValue(v.getRefundStatus()))
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getSpecPrice()))
|
|
|
|
+ .sum()), null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 5, startRows, "实际总额(做法-加料)", null));
|
|
|
|
+ customExcelItemList.add(new CustomExcelItem(startColumn + 6, startRows,
|
|
|
|
+ FormatUtil.intShrink100ToStr(orders.stream()
|
|
|
|
+ .filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
|
|
|
|
+ .mapToInt(v -> Checker.getIntegerValue(v.getSpecPrice()))
|
|
|
|
+ .sum()), null));
|
|
startRows += 2;
|
|
startRows += 2;
|
|
// v1.3.1_nfyybyfy 新增职工统计
|
|
// v1.3.1_nfyybyfy 新增职工统计
|
|
// 职工支付
|
|
// 职工支付
|