Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-admin into f-6.7.0

src/main/java/com/ctrip/fun/admin/service/order/EventActivityExcelExportService.java

@@ -36,12 +36,12 @@ public class EventActivityExcelExportService extends AbstractExcelExportService<
         
         if("list_invoice".equals(listType)){
 	        String[] title_invoice = { "订单号", "联系人", "订单名称", "城市", "打球时间", "支付方式", "实付金额", "下单时间", "途径", "状态", "是否需要发票", "发票类型",    "发票抬头", "纳税人识别号", "地址、电话", "开户行及账号",    "收件地址", "联系人", "电话", "开票明细", "开票金额", "开票备注", "支付订单编号",
-	                "手动扣款类型", "订单来源", "用户类型","成本"};	
+	                "手动扣款类型", "订单来源", "用户类型","成本", "支付平台"};	
 	        return title_invoice;
         }else{
         	return new String[] { "订单号", "订单名称", "类型", "状态", "联系人姓名", "联系人电话", "报名人数", "会员数", "嘉宾数", "会员/嘉宾1", "嘉宾2", "嘉宾3", "嘉宾4", "性别1", "性别2", "性别3", "性别4", "差点1", "差点2", "差点3", "差点4",
                     "成员1手机号", "成员2手机号", "成员3手机号", "成员4手机号", "备注", "并组要求","会员价", "会员价立减", "嘉宾价", "嘉宾价立减", "实付","预付","余额","兑换券", "在线支付退款金额", 
-                    "余额退款金额" , "优惠券退款金额","保险", "底价", "接管人", "订单来源", "下单时间", "打球时间" };
+                    "余额退款金额" , "优惠券退款金额","保险", "底价", "接管人", "订单来源", "下单时间", "打球时间", "支付平台" };
 	    }
     }
 
@@ -91,6 +91,7 @@ public class EventActivityExcelExportService extends AbstractExcelExportService<
             cellList_invoice.get(25).setCellValue("");
             //添加成本价格:
             cellList_invoice.get(26).setCellValue(bean.getFloorPrice() == null ? null : df.format(bean.getQuantity()*bean.getFloorPrice()));
+            cellList_invoice.get(27).setCellValue(bean.getPlatform());
     	}else{
             List<CustomerInfoBean> custInfoBeans = bean.getCustomerInfos();
             ArrayList<XSSFCell> cellList_all = new ArrayList<XSSFCell>();
@@ -144,7 +145,8 @@ public class EventActivityExcelExportService extends AbstractExcelExportService<
             cellList_all.get(40).setCellValue(bean.getReceiver());
             cellList_all.get(41).setCellValue(bean.getOrderSourceCategory());
             cellList_all.get(42).setCellValue(bean.getOrderDate() == null ? null : format.format(bean.getOrderDate()));
-            cellList_all.get(43).setCellValue(bean.getPlayDate() == null ? null : format.format(bean.getPlayDate()));    		
+            cellList_all.get(43).setCellValue(bean.getPlayDate() == null ? null : format.format(bean.getPlayDate()));  
+            cellList_all.get(44).setCellValue(bean.getPlatform());   		
     	}