feature: 订单下载

src/main/java/com/ywt/mg/domain/mealEntities/UserMealOrderView.java

@@ -111,6 +111,12 @@ public class UserMealOrderView implements Serializable {
     @Column(name = "need_package")
     private Boolean needPackage;
 
+    @Column(name ="total_cost_package_fee")
+    private Integer totalCostPackageFee;
+
+    @Column(name = "spec_price")
+    private Integer specPrice;
+
     public Integer getHospitalId() {
         return hospitalId;
     }
@@ -372,6 +378,22 @@ public class UserMealOrderView implements Serializable {
         this.needPackage = needPackage;
     }
 
+    public Integer getTotalCostPackageFee() {
+        return totalCostPackageFee;
+    }
+
+    public void setTotalCostPackageFee(Integer totalCostPackageFee) {
+        this.totalCostPackageFee = totalCostPackageFee;
+    }
+
+    public Integer getSpecPrice() {
+        return specPrice;
+    }
+
+    public void setSpecPrice(Integer specPrice) {
+        this.specPrice = specPrice;
+    }
+
     @Override
     public String toString() {
         return "UserMealOrderView{" +

src/main/java/com/ywt/mg/services/MealOrderService.java

@@ -511,7 +511,7 @@ public class MealOrderService {
                             .filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
                             .mapToInt(v -> Checker.getIntegerValue(v.getOrderAmount()))
                             .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));
             startRows += 1;
             // 微信支付
@@ -532,7 +532,7 @@ public class MealOrderService {
                             .filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
                             .mapToInt(v -> Checker.getIntegerValue(v.getWechatPayAmount()))
                             .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));
             startRows += 1;
             // 金币支付
@@ -553,7 +553,7 @@ public class MealOrderService {
                             .filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
                             .mapToInt(v -> Checker.getIntegerValue(v.getCoinPayAmount()))
                             .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));
             startRows += 1;
             // 现场支付
@@ -574,7 +574,7 @@ public class MealOrderService {
                             .filter(v -> RefundStatusEnum.SUCCESS.getValue() != Checker.getIntegerValue(v.getRefundStatus()))
                             .mapToInt(v -> Checker.getIntegerValue(v.getF2fPayAmount()))
                             .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));
             startRows += 1;
             // 洗碗费
@@ -595,6 +595,37 @@ public class MealOrderService {
                             .filter(v -> Checker.getIntegerValue(v.getPackageFee()) > 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.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;
             customExcelItemList.add(new CustomExcelItem(startColumn + 1, startRows, "配送费总额", null));
             customExcelItemList.add(new CustomExcelItem(startColumn + 2, startRows,
@@ -602,6 +633,37 @@ public class MealOrderService {
                             .filter(v -> Checker.getIntegerValue(v.getDeliveryFee()) > 0)
                             .mapToInt(v -> Checker.getIntegerValue(v.getDeliveryFee()))
                             .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;
             // v1.3.1_nfyybyfy 新增职工统计
             // 职工支付