diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 665b9c906..b031c8ce9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -162,7 +162,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); - filterChainDefinitionMap.put("/**", "anon"); +// filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 247597318..fa0b4e34a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -52,13 +52,13 @@ public class BaseController { }); } public MallUserInfo getUser(){ -// MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); - MallUserInfo user = new MallUserInfo(); - user.setId(321127266275430400L); - user.setName("alitest"); - user.setTenantId("789"); - user.setParentTenantId(null); - user.setIsAdmin(1); + MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); +// MallUserInfo user = new MallUserInfo(); +// user.setId(321127266275430400L); +// user.setName("alitest"); +// user.setTenantId("789"); +// user.setParentTenantId(null); +// user.setIsAdmin(1); return user; } @@ -80,10 +80,10 @@ public class BaseController { */ public TenantEntity getTenantInfo(){ Session session = SecurityUtils.getSubject().getSession(); -// String tenantId = (String)session.getAttribute(UserSession.tenantId); -// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); - String tenantId = "789"; - String parentTenantId = null; + String tenantId = (String)session.getAttribute(UserSession.tenantId); + String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); +// String tenantId = "789"; +// String parentTenantId = null; TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java index bc7a1bb4c..de685ca09 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java @@ -245,9 +245,12 @@ public class WxRaffleActivityController extends BaseController { wxCashBackActivityRecord.updateTenantInfo(tenantInfo); wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); if (null != wxCashBackActivityRecord.getActivityId()) { + List _aids = new ArrayList(); + _aids.add(wxCashBackActivityRecord.getActivityId()); + Map itemMap = wxCashBackActivityService.getItemMap(wxCashBackActivityRecord,_aids); List> oneActivityExeclList = new ArrayList>(); PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000,oneActivityExeclList); - wxCashBackActivityService.exportData(oneActivityExeclList, "线下抽奖记录", request, response); + wxCashBackActivityService.exportData(WxRaffleActivityRecord.generateExcelTitle(itemMap),oneActivityExeclList, "线下抽奖记录.xlsx","sheet1", request, response); }else { PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000,null); List result = null; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java index 322f64e76..b136ba288 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -111,29 +112,51 @@ public class WxRaffleActivityRecord extends TenantEntity { return null; } + public static Map generateExcelTitle(Map itemMap) { + Map excelTitle = new LinkedHashMap(); + excelTitle.put("activityName", "活动名称"); + excelTitle.put("merchantId", "商户id"); + excelTitle.put("orderNo", "订单号"); + excelTitle.put("orderMoney", "订单金额"); + excelTitle.put("cusName", "客户姓名"); + excelTitle.put("phone", "客户电话"); + excelTitle.put("address", "客户地址"); + excelTitle.put("auditStatus", "状态"); + excelTitle.put("auditRemark", "审核内容"); + excelTitle.put("createDate", "提交时间"); + if (null != itemMap) { + for (Iterator it = itemMap.keySet().iterator();it.hasNext();) { + Long itemId = it.next(); + WxRaffleActivityItem item = itemMap.get(itemId); + excelTitle.put(String.valueOf(item.getId()),item.getName()); + } + } + return excelTitle; + } + public Map generateExcelData(Map itemMap) { Map excelObject = new HashMap(); - excelObject.put("活动名称", activityName); - excelObject.put("商户id", merchantId); - excelObject.put("订单号", orderNo); - excelObject.put("订单金额", orderMoney); - excelObject.put("客户姓名", cusName); - excelObject.put("客户电话", phone); - excelObject.put("客户地址", address); + excelObject.put("activityName", activityName); + excelObject.put("merchantId", merchantId); + excelObject.put("orderNo", orderNo); + excelObject.put("orderMoney", orderMoney); + excelObject.put("cusName", cusName); + excelObject.put("phone", phone); + excelObject.put("address", address); EnumCashBackActivityRecordStatus status = EnumCashBackActivityRecordStatus.getEnum(auditStatus); if (null != status ) { - excelObject.put("状态", status.getMessage()); + excelObject.put("auditStatus", status.getMessage()); } - excelObject.put("审核内容", auditRemark); - excelObject.put("提交时间", DateUtils.date2String(createDate)); + excelObject.put("auditRemark", auditRemark); + excelObject.put("createDate", DateUtils.date2String(createDate)); if (null != itemMap) { for (Iterator it = itemMap.keySet().iterator();it.hasNext();) { Long itemId = it.next(); WxRaffleActivityItem item = itemMap.get(itemId); if (null != recordItemIdList && recordItemIdList.contains(itemId)) { - excelObject.put(item.getName(), 1); + excelObject.put(String.valueOf(item.getId()), 1); }else { - excelObject.put(item.getName(), 0); + excelObject.put(String.valueOf(item.getId()), 0); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java index 1341ddaf6..5c169f358 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java @@ -69,7 +69,9 @@ public interface WxRaffleActivityService { List getActivityMerchants(Long activityId,String tenantId,boolean hasMerchantInfo); void exportData(List objectList,String sheetName,Class objectCalss,HttpServletRequest request, HttpServletResponse response); - void exportData(List> objectList,String fileName,HttpServletRequest request, HttpServletResponse response); + void exportData(Map titleMap,List> objectList,String fileName,String sheetName,HttpServletRequest request, HttpServletResponse response); + + Map getItemMap(TenantEntity tenantEntity,List activitIds); void auditRecord(WxRaffleActivityRecord record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java index 88a7b7b59..0849ef09b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -192,8 +192,8 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { } } - - private Map getItemMap(TenantEntity tenantEntity,List activitIds) { + @Override + public Map getItemMap(TenantEntity tenantEntity,List activitIds) { WxRaffleActivityItem iq = new WxRaffleActivityItem(); iq.updateTenantInfo(tenantEntity); iq.setActivityIdList(activitIds); @@ -384,9 +384,9 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { } @Override - public void exportData(List> objectList, String fileName, HttpServletRequest request, + public void exportData(Map titleMap,List> objectList, String fileName,String sheetName, HttpServletRequest request, HttpServletResponse response) { - excelService.exportExcel(objectList, fileName, response); + excelService.exportExcel(titleMap,objectList, fileName,sheetName, response); } @Override