| @@ -1658,6 +1658,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| exportHead.add(entity_1); | exportHead.add(entity_1); | ||||
| // ExcelExportEntity entity_2 = new ExcelExportEntity("数量","awardCount",20); | // ExcelExportEntity entity_2 = new ExcelExportEntity("数量","awardCount",20); | ||||
| // exportHead.add(entity_2); | // exportHead.add(entity_2); | ||||
| ExcelExportEntity entity_2 = new ExcelExportEntity("返现比例","cashBackRatio",20); | |||||
| exportHead.add(entity_2); | |||||
| ExcelExportEntity entity_3 = new ExcelExportEntity("返现金额","awardPrice",20); | ExcelExportEntity entity_3 = new ExcelExportEntity("返现金额","awardPrice",20); | ||||
| exportHead.add(entity_3); | exportHead.add(entity_3); | ||||
| ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); | ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); | ||||
| @@ -1690,6 +1692,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| Map<String,Object> grantItemObject= getGrantItemExportObject(record,grant); | Map<String,Object> grantItemObject= getGrantItemExportObject(record,grant); | ||||
| grantItemObject.put("awardName",grantItem.getAwardName()); | grantItemObject.put("awardName",grantItem.getAwardName()); | ||||
| // grantItemObject.put("awardCount",grantItem.getAwardCount()); | // grantItemObject.put("awardCount",grantItem.getAwardCount()); | ||||
| grantItemObject.put("cashBackRatio",grantItem.getCashBackRatio()); | |||||
| grantItemObject.put("awardPrice",grantItem.getAwardPrice()); | grantItemObject.put("awardPrice",grantItem.getAwardPrice()); | ||||
| grantItemObject.put("mallShareRate",grantItem.getMallShareRate()); | grantItemObject.put("mallShareRate",grantItem.getMallShareRate()); | ||||
| grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); | grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); | ||||