Преглед на файлове

feature: 隐藏洗碗费

Walker преди 10 месеца
родител
ревизия
23612fac05
променени са 1 файла, в които са добавени 12 реда и са изтрити 12 реда
  1. 12 12
      src/main/java/com/ywt/mg/services/MealOrderService.java

+ 12 - 12
src/main/java/com/ywt/mg/services/MealOrderService.java

@@ -577,18 +577,18 @@ public class MealOrderService {
             customExcelItemList.add(new CustomExcelItem(startColumn + 7, startRows, "菜品现场点单成本", null));
             customExcelItemList.add(new CustomExcelItem(startColumn + 8, startRows, p2fSinglePointCost, null));
             startRows += 1;
-            // 洗碗费
-            // 目前只计算有金币支付的订单,不包括纯微信支付及现场支付订单。计算的规则是符合条件的订单的微信支付金额总和。
-            // 等同这个 SQL 语句:
-            // select sum(wechat_pay_amount) from nutrimeal.meal_order where deleted = 0 and pay_type = 4 and (refund_status is null or refund_status != 1) and wechat_pay_amount is not null ;
-            customExcelItemList.add(new CustomExcelItem(startColumn + 1, startRows, "2元洗碗费总额", null));
-            customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
-                    FormatUtil.intShrink100ToStr(orders.stream()
-                            .filter(v -> OrderPayTypeEnum.COIN.getValue() == Checker.getIntegerValue(v.getPayType()) &&
-                                    RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
-                            .mapToInt(v -> Checker.getIntegerValue(v.getWechatPayAmount()))
-                            .sum()), null));
-            startRows += 1;
+//            // 洗碗费
+//            // 目前只计算有金币支付的订单,不包括纯微信支付及现场支付订单。计算的规则是符合条件的订单的微信支付金额总和。
+//            // 等同这个 SQL 语句:
+//            // select sum(wechat_pay_amount) from nutrimeal.meal_order where deleted = 0 and pay_type = 4 and (refund_status is null or refund_status != 1) and wechat_pay_amount is not null ;
+//            customExcelItemList.add(new CustomExcelItem(startColumn + 1, startRows, "2元洗碗费总额", null));
+//            customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
+//                    FormatUtil.intShrink100ToStr(orders.stream()
+//                            .filter(v -> OrderPayTypeEnum.COIN.getValue() == Checker.getIntegerValue(v.getPayType()) &&
+//                                    RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
+//                            .mapToInt(v -> Checker.getIntegerValue(v.getWechatPayAmount()))
+//                            .sum()), null));
+//            startRows += 1;
             customExcelItemList.add(new CustomExcelItem(startColumn + 1, startRows, "包装费总额", null));
             customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
                     FormatUtil.intShrink100ToStr(orders.stream()