fix 修改营养餐订单相关接口，返回包装费和配送费

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

@@ -99,6 +99,17 @@ public class UserMealOrderView implements Serializable {
     private Integer staffId;
     @Column(name = "ext_status")
     private Integer extStatus;
+    /**
+     * 订单总包装费
+     */
+    @Column(name = "package_fee")
+    private Integer packageFee;
+
+    /**
+     * 是否需要包装，默认为否，主要是区分无需包装和需要包装但包装费为 0 的情况
+     */
+    @Column(name = "need_package")
+    private Boolean needPackage;
 
     public Integer getHospitalId() {
         return hospitalId;
@@ -345,6 +356,22 @@ public class UserMealOrderView implements Serializable {
         return deptName;
     }
 
+    public Integer getPackageFee() {
+        return packageFee;
+    }
+
+    public void setPackageFee(Integer packageFee) {
+        this.packageFee = packageFee;
+    }
+
+    public Boolean getNeedPackage() {
+        return needPackage;
+    }
+
+    public void setNeedPackage(Boolean needPackage) {
+        this.needPackage = needPackage;
+    }
+
     @Override
     public String toString() {
         return "UserMealOrderView{" +
@@ -377,6 +404,8 @@ public class UserMealOrderView implements Serializable {
                 "deptName=" + deptName + '\'' +
                 "staffId=" + staffId + '\'' +
                 "extStatus=" + extStatus + '\'' +
+                "packageFee=" + packageFee + '\'' +
+                "needPackage=" + needPackage + '\'' +
                 '}';
     }
 }

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

@@ -332,6 +332,8 @@ public class MealOrderService {
             String col15 = "微信支付";
             String col16 = "金币支付";
             String col17 = "现场支付";
+            String col17_1 = "包装费";
+            String col17_2 = "配送费";
             String col18 = "医院";
 //         String filename = "订餐订单列表";
             String col19 = "取餐码";
@@ -348,12 +350,12 @@ public class MealOrderService {
                 // 管理后台显示支付流水号
                 columns = new String[]{
                         col2, col3, col3_1, col3_2, col18, col4, col5, col20, col21, col6, col19, col7, col8, col9,
-                        col10, col15, col16, col17, col11, col12, col13, col14
+                        col10, col15, col16, col17, col17_1, col17_2, col11, col12, col13, col14
                 };
             } else {
                 columns = new String[]{
                         col2, col4, col5, col20, col6, col19, col7, col8, col9,
-                        col10, col15, col16, col17, col11, col12, col13, col14
+                        col10, col15, col16, col17, col17_1, col17_2, col11, col12, col13, col14
                 };
             }
             List<Shop> shopList = shopService.getAllShops();
@@ -405,6 +407,10 @@ public class MealOrderService {
                 map.getStringListSafely(col16).add(coinPayAmount);
                 String f2fPayAmount = FormatUtil.intShrink100ToStr(userMealOrderView.getF2fPayAmount());
                 map.getStringListSafely(col17).add(f2fPayAmount);
+                String packagePayAmount = FormatUtil.intShrink100ToStr(userMealOrderView.getPackageFee());
+                map.getStringListSafely(col17_1).add(packagePayAmount);
+                String deliveryPayAmount = FormatUtil.intShrink100ToStr(userMealOrderView.getDeliveryFee());
+                map.getStringListSafely(col17_2).add(deliveryPayAmount);
                 map.getStringListSafely(col19).add(Checker.getStringValue(userMealOrderView.getPickupCode()));
                 map.getStringListSafely(col20).add(userMealOrderView.getStaffId() == null ? "否" : "是");
             });
@@ -574,6 +580,20 @@ public class MealOrderService {
                                     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()
+                            .filter(v -> Checker.getIntegerValue(v.getPackageFee()) > 0)
+                            .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.getDeliveryFee()) > 0)
+                            .mapToInt(v -> Checker.getIntegerValue(v.getDeliveryFee()))
+                            .sum()), null));
             startRows += 2;
             // v1.3.1_nfyybyfy 新增职工统计
             // 职工支付