feature:营养餐对账

src/main/java/com/ywt/mg/domain/models/nutrimeal/MealOrderInfo.java

@@ -39,6 +39,8 @@ public class MealOrderInfo implements Serializable {
 
     private String payStatus;
 
+    private Integer payType;
+
     public Integer getId() {
         return id;
     }
@@ -158,4 +160,12 @@ public class MealOrderInfo implements Serializable {
     public void setWechatInt(Integer wechatInt) {
         this.wechatInt = wechatInt;
     }
+
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
 }

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

@@ -654,7 +654,8 @@ public class MealOrderService {
             String col3 = "交易日期*";
             String col4 = "订单号";
             String col5 = "类型";
-            String[] columns = new String[]{col0, col1, col2, col3, col4, col5};
+            String col6 = "支付渠道";
+            String[] columns = new String[]{col0, col1, col2, col3, col4, col5, col6};
             List<Shop> shopList = shopService.getAllShops();
             ExcelDataMap map = new ExcelDataMap(columns);
             List<UserMealOrderView> userMealOrderViews = queryDownLoadMealOrderList(request);
@@ -692,7 +693,7 @@ public class MealOrderService {
                     // 总价
                     info.setTotalStr(FormatUtil.intShrink100ToStr(p.getOrderAmount()));
                     info.setWechatInt(Checker.getIntegerValue(p.getWechatPayAmount()));
-
+                    info.setPayType(Checker.getIntegerValue(p.getPayType()));
 //                item.put("totalStr", FormatUtil.intShrink100ToStr(p.getOrderAmount()));
 //                item.put("wechatStr", FormatUtil.intShrink100ToStr(p.getWechatPayAmount()));
 //                item.put("wechatInt", Checker.getIntegerValue(p.getWechatPayAmount()));
@@ -772,6 +773,7 @@ public class MealOrderService {
                                 map.getStringListSafely(col3).add(paymentTimeStr);
                                 map.getStringListSafely(col4).add(orderNo);
                                 map.getStringListSafely(col5).add(typeName);
+                                map.getStringListSafely(col6).add(OrderPayTypeEnum.valueOf(Checker.getIntegerValue(p.getPayType())).getDisplayName());
                                 rowSize++;
 //                            ExcelHelper.settingMainBodyLabelCell(sheet, cellFormat2, n, bodyStr);
 //                            n++;
@@ -811,6 +813,7 @@ public class MealOrderService {
                                 map.getStringListSafely(col3).add(refundTimeStr);
                                 map.getStringListSafely(col4).add(orderNo);
                                 map.getStringListSafely(col5).add(typeName);
+                                map.getStringListSafely(col6).add(OrderPayTypeEnum.valueOf(Checker.getIntegerValue(p.getPayType())).getDisplayName());
                                 rowSize++;
                             }
                         }