Merge remote-tracking branch 'origin/dev' into dev

xinyb_

2021-05-24 c8636e4ca03e7fe13902ff98687f7591706cc780

 src/com/yc/sdk/shopping/service/panicBuying/ExportOrderToExcelImpl.java

@@ -30,7 +30,6 @@
import com.yc.sdk.shopping.action.jiazhuang.ExcelColumnInfo;
import com.yc.sdk.shopping.action.jiazhuang.ExcelUtil;
import com.yc.sdk.shopping.service.ShoppingImageIfc;
import com.yc.sdk.shopping.service.panicBuying.PanicBuyingOrderIfc;


@Service("ExportOrderToExcel")
@@ -114,7 +113,8 @@
        orderColumns.add(new ExcelColumnInfo("配送费", "TransCosts",centerStyle,ExcelColumnInfo.SUM_FIELD_SUM,ExcelColumnInfo.DATA_TYPE_DOUBLE));
        orderColumns.add(new ExcelColumnInfo("配送方式", "FreeName",wrapStyle));
        orderColumns.add(new ExcelColumnInfo("下单时间", "EnterDate",wrapStyle));
        orderColumns.add(new ExcelColumnInfo("核销状态", "HeXiaoStatusName",wrapStyle));
        orderColumns.add(new ExcelColumnInfo("核销/退款状态", "HeXiaoStatusName",wrapStyle));
        //orderColumns.add(new ExcelColumnInfo("退款状态", "ReturnStatusName",wrapStyle));  //暂时不需要，“核销状态”已包含退款状态
        orderColumns.add(new ExcelColumnInfo("地址", "FullAddress",wrapStyle));
        //columns.add(new ExcelColumnInfo("详情", "OPERATION_DETAIL",wrapStyle));
        //columns.add(new ExcelColumnInfo("备注", "REMARK",wrapStyle));
@@ -126,6 +126,7 @@
        sellerRankingColumns.add(new ExcelColumnInfo("营销人员名称", "SellerName",wrapStyle)); 
        sellerRankingColumns.add(new ExcelColumnInfo("营销人员电话", "SellerTelephone",wrapStyle)); 
        sellerRankingColumns.add(new ExcelColumnInfo("订单次数", "OrderCount",centerStyle,ExcelColumnInfo.SUM_FIELD_SUM,ExcelColumnInfo.DATA_TYPE_INTEGER)); 
        sellerRankingColumns.add(new ExcelColumnInfo("订单数量", "DigitSum",centerStyle,ExcelColumnInfo.SUM_FIELD_SUM,ExcelColumnInfo.DATA_TYPE_DOUBLE)); 
        sellerRankingColumns.add(new ExcelColumnInfo("订单金额", "PayableAmountSum",centerStyle,ExcelColumnInfo.SUM_FIELD_SUM,ExcelColumnInfo.DATA_TYPE_DOUBLE)); 
        sellerRankingColumns.add(new ExcelColumnInfo("排名", "Ranking",centerStyle)); 
        excelInfo.put("业绩排行", sellerRankingColumns);
@@ -147,7 +148,8 @@
        sheet.setColumnWidth(8, 20*256);
        sheet.setColumnWidth(9, 20*256);
        sheet.setColumnWidth(10, 20*256);
        sheet.setColumnWidth(11, 50*256);
        sheet.setColumnWidth(11, 20*256);
        sheet.setColumnWidth(12, 50*256);
        
        //获取导出数据
        List<Map<String, Object>> orderList=null;