| @@ -1642,6 +1642,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); | grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); | ||||
| grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice()); | grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice()); | ||||
| grantItemObject.put("realMerchantSharePrice",grantItem.getRealMerchantSharePrice()); | grantItemObject.put("realMerchantSharePrice",grantItem.getRealMerchantSharePrice()); | ||||
| grantItemObjectList.add(grantItemObject); | |||||
| }); | }); | ||||
| } | } | ||||
| @@ -1693,11 +1695,12 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); | grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); | ||||
| grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice()); | grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice()); | ||||
| grantItemObject.put("realMerchantSharePrice",grantItem.getRealMerchantSharePrice()); | grantItemObject.put("realMerchantSharePrice",grantItem.getRealMerchantSharePrice()); | ||||
| grantItemObjectList.add(grantItemObject); | |||||
| }); | }); | ||||
| } | } | ||||
| excelService.exportExcel(exportHead, grantItemObjectList, null, "返现活动发放明细", "返现活动发放明细.xlsx",true, response); | excelService.exportExcel(exportHead, grantItemObjectList, null, "返现活动发放明细", "返现活动发放明细.xlsx",true, response); | ||||
| } | } | ||||
| private List<ExcelExportEntity> getGrantItemExportHead(){ | private List<ExcelExportEntity> getGrantItemExportHead(){ | ||||