| @@ -1514,22 +1514,22 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||
| ExcelExportEntity entity14 = new ExcelExportEntity(null,String.valueOf(activityItem.getId())+"_"+String.valueOf(awardsItem.getId())+"_orderAwardsList",160); | |||
| List<ExcelExportEntity> entity14_list = new ArrayList<>(); | |||
| ExcelExportEntity entity14_1 = new ExcelExportEntity("抽奖活动名称","activityItemName",20); | |||
| entity13_list.add(entity14_1); | |||
| entity14_list.add(entity14_1); | |||
| ExcelExportEntity entity14_2 = new ExcelExportEntity("奖品名称","awardsItemName",20); | |||
| entity13_list.add(entity14_2); | |||
| entity14_list.add(entity14_2); | |||
| ExcelExportEntity entity14_3 = new ExcelExportEntity("奖品数量","awardsItemCount",20); | |||
| entity13_list.add(entity14_3); | |||
| entity14_list.add(entity14_3); | |||
| ExcelExportEntity entity14_4 = new ExcelExportEntity("奖品价值","awardsItemPrice",20); | |||
| entity13_list.add(entity14_4); | |||
| entity14_list.add(entity14_4); | |||
| ExcelExportEntity entity14_5 = new ExcelExportEntity("商管承担比例(%)","mallRate",20); | |||
| entity13_list.add(entity14_5); | |||
| entity14_list.add(entity14_5); | |||
| ExcelExportEntity entity14_6 = new ExcelExportEntity("商户承担比例(%)","merchantRate",20); | |||
| entity13_list.add(entity14_6); | |||
| entity14_list.add(entity14_6); | |||
| ExcelExportEntity entity14_7 = new ExcelExportEntity("商管承担金额","mallSharePrice",20); | |||
| entity13_list.add(entity14_7); | |||
| entity14_list.add(entity14_7); | |||
| ExcelExportEntity entity14_8 = new ExcelExportEntity("商户承担比例","merchantSharePrice",20); | |||
| entity13_list.add(entity14_8); | |||
| entity13.setList(entity14_list); | |||
| entity14_list.add(entity14_8); | |||
| entity14.setList(entity14_list); | |||
| headList.add(entity14); | |||
| } | |||
| }else{ | |||
| @@ -1615,22 +1615,22 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||
| ExcelExportEntity entity14 = new ExcelExportEntity(null,String.valueOf(activityItem.getId())+"_orderAwardsList",160); | |||
| List<ExcelExportEntity> entity14_list = new ArrayList<>(); | |||
| ExcelExportEntity entity14_1 = new ExcelExportEntity("满额赠礼活动名称","activityItemName",20); | |||
| entity13_list.add(entity14_1); | |||
| entity14_list.add(entity14_1); | |||
| ExcelExportEntity entity14_2 = new ExcelExportEntity("礼品名称","awardsItemName",20); | |||
| entity13_list.add(entity14_2); | |||
| entity14_list.add(entity14_2); | |||
| // ExcelExportEntity entity14_3 = new ExcelExportEntity("奖品数量","awardsItemCount",20); | |||
| // entity13_list.add(entity14_3); | |||
| // entity14_list.add(entity14_3); | |||
| ExcelExportEntity entity14_4 = new ExcelExportEntity("礼品价值","awardsItemPrice",20); | |||
| entity13_list.add(entity14_4); | |||
| entity14_list.add(entity14_4); | |||
| ExcelExportEntity entity14_5 = new ExcelExportEntity("商管承担比例(%)","mallRate",20); | |||
| entity13_list.add(entity14_5); | |||
| entity14_list.add(entity14_5); | |||
| ExcelExportEntity entity14_6 = new ExcelExportEntity("商户承担比例(%)","merchantRate",20); | |||
| entity13_list.add(entity14_6); | |||
| entity14_list.add(entity14_6); | |||
| ExcelExportEntity entity14_7 = new ExcelExportEntity("商管承担金额","mallSharePrice",20); | |||
| entity13_list.add(entity14_7); | |||
| entity14_list.add(entity14_7); | |||
| ExcelExportEntity entity14_8 = new ExcelExportEntity("商户承担比例","merchantSharePrice",20); | |||
| entity13_list.add(entity14_8); | |||
| entity13.setList(entity14_list); | |||
| entity14_list.add(entity14_8); | |||
| entity14.setList(entity14_list); | |||
| headList.add(entity14); | |||
| }else{ | |||
| ExcelExportEntity entity14 = new ExcelExportEntity("满额赠礼活动名称", | |||
| @@ -1711,32 +1711,32 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||
| ExcelExportEntity entity14 = new ExcelExportEntity(null,String.valueOf(activityItem.getId())+"_orderAwardsList",220); | |||
| List<ExcelExportEntity> entity14_list = new ArrayList<>(); | |||
| ExcelExportEntity entity14_1 = new ExcelExportEntity("返现活动名称","activityItemName",20); | |||
| entity13_list.add(entity14_1); | |||
| entity14_list.add(entity14_1); | |||
| ExcelExportEntity entity14_2 = new ExcelExportEntity("返现奖项名称","awardsItemName",20); | |||
| entity13_list.add(entity14_2); | |||
| entity14_list.add(entity14_2); | |||
| ExcelExportEntity entity14_3 = new ExcelExportEntity("订单返现比例(%)","cashBackRatio",20); | |||
| entity13_list.add(entity14_3); | |||
| entity14_list.add(entity14_3); | |||
| // ExcelExportEntity entity14_3 = new ExcelExportEntity("奖品数量","awardsItemCount",20); | |||
| // entity13_list.add(entity14_3); | |||
| // entity14_list.add(entity14_3); | |||
| ExcelExportEntity entity14_4 = new ExcelExportEntity("返现金额","awardsItemPrice",20); | |||
| entity13_list.add(entity14_4); | |||
| entity14_list.add(entity14_4); | |||
| ExcelExportEntity entity14_5 = new ExcelExportEntity("商管承担比例(%)","mallRate",20); | |||
| entity13_list.add(entity14_5); | |||
| entity14_list.add(entity14_5); | |||
| ExcelExportEntity entity14_6 = new ExcelExportEntity("商户承担比例(%)","merchantRate",20); | |||
| entity13_list.add(entity14_6); | |||
| entity14_list.add(entity14_6); | |||
| ExcelExportEntity entity14_7 = new ExcelExportEntity("商管承担金额","mallSharePrice",20); | |||
| entity13_list.add(entity14_7); | |||
| entity14_list.add(entity14_7); | |||
| ExcelExportEntity entity14_8 = new ExcelExportEntity("商户承担金额","merchantSharePrice",20); | |||
| entity13_list.add(entity14_8); | |||
| entity14_list.add(entity14_8); | |||
| ExcelExportEntity entity14_9 = new ExcelExportEntity("税点金额起点","startingTaxPoint",20); | |||
| entity13_list.add(entity14_9); | |||
| entity14_list.add(entity14_9); | |||
| ExcelExportEntity entity14_10 = new ExcelExportEntity("税点比例(%)","taxPoints",20); | |||
| entity13_list.add(entity14_10); | |||
| entity14_list.add(entity14_10); | |||
| ExcelExportEntity entity14_11 = new ExcelExportEntity("税点金额","taxPointsAmount",20); | |||
| entity13_list.add(entity14_11); | |||
| entity14_list.add(entity14_11); | |||
| ExcelExportEntity entity14_12 = new ExcelExportEntity("订单实际返现金额","realCashBackPrice",20); | |||
| entity13_list.add(entity14_12); | |||
| entity13.setList(entity14_list); | |||
| entity14_list.add(entity14_12); | |||
| entity14.setList(entity14_list); | |||
| headList.add(entity14); | |||
| }else{ | |||
| ExcelExportEntity entity14 = new ExcelExportEntity("返现活动名称", | |||