| @@ -162,7 +162,7 @@ public class ShiroConfig { | |||||
| filterChainDefinitionMap.put("/logout", "authc"); | filterChainDefinitionMap.put("/logout", "authc"); | ||||
| filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | ||||
| filterChainDefinitionMap.put("/**", "anon"); | |||||
| // filterChainDefinitionMap.put("/**", "anon"); | |||||
| shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | ||||
| @@ -52,13 +52,13 @@ public class BaseController { | |||||
| }); | }); | ||||
| } | } | ||||
| public MallUserInfo getUser(){ | 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; | return user; | ||||
| } | } | ||||
| @@ -80,10 +80,10 @@ public class BaseController { | |||||
| */ | */ | ||||
| public TenantEntity getTenantInfo(){ | public TenantEntity getTenantInfo(){ | ||||
| Session session = SecurityUtils.getSubject().getSession(); | 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 tenantEntity = new TenantEntity(); | ||||
| tenantEntity.setTenantId(tenantId); | tenantEntity.setTenantId(tenantId); | ||||
| tenantEntity.setParentTenantId(parentTenantId); | tenantEntity.setParentTenantId(parentTenantId); | ||||
| @@ -245,9 +245,12 @@ public class WxRaffleActivityController extends BaseController { | |||||
| wxCashBackActivityRecord.updateTenantInfo(tenantInfo); | wxCashBackActivityRecord.updateTenantInfo(tenantInfo); | ||||
| wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); | wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); | ||||
| if (null != wxCashBackActivityRecord.getActivityId()) { | if (null != wxCashBackActivityRecord.getActivityId()) { | ||||
| List<Long> _aids = new ArrayList<Long>(); | |||||
| _aids.add(wxCashBackActivityRecord.getActivityId()); | |||||
| Map<Long,WxRaffleActivityItem> itemMap = wxCashBackActivityService.getItemMap(wxCashBackActivityRecord,_aids); | |||||
| List<Map<String,Object>> oneActivityExeclList = new ArrayList<Map<String,Object>>(); | List<Map<String,Object>> oneActivityExeclList = new ArrayList<Map<String,Object>>(); | ||||
| PageInfo<WxRaffleActivityRecord> page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000,oneActivityExeclList); | PageInfo<WxRaffleActivityRecord> page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000,oneActivityExeclList); | ||||
| wxCashBackActivityService.exportData(oneActivityExeclList, "线下抽奖记录", request, response); | |||||
| wxCashBackActivityService.exportData(WxRaffleActivityRecord.generateExcelTitle(itemMap),oneActivityExeclList, "线下抽奖记录.xlsx","sheet1", request, response); | |||||
| }else { | }else { | ||||
| PageInfo<WxRaffleActivityRecord> page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000,null); | PageInfo<WxRaffleActivityRecord> page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000,null); | ||||
| List<WxRaffleActivityRecord> result = null; | List<WxRaffleActivityRecord> result = null; | ||||
| @@ -16,6 +16,7 @@ import java.util.ArrayList; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.HashMap; | import java.util.HashMap; | ||||
| import java.util.Iterator; | import java.util.Iterator; | ||||
| import java.util.LinkedHashMap; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| @@ -111,29 +112,51 @@ public class WxRaffleActivityRecord extends TenantEntity { | |||||
| return null; | return null; | ||||
| } | } | ||||
| public static Map<String,String> generateExcelTitle(Map<Long,WxRaffleActivityItem> itemMap) { | |||||
| Map<String,String> excelTitle = new LinkedHashMap<String,String>(); | |||||
| 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<Long> 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<String,Object> generateExcelData(Map<Long,WxRaffleActivityItem> itemMap) { | public Map<String,Object> generateExcelData(Map<Long,WxRaffleActivityItem> itemMap) { | ||||
| Map<String,Object> excelObject = new HashMap<String,Object>(); | Map<String,Object> excelObject = new HashMap<String,Object>(); | ||||
| 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); | EnumCashBackActivityRecordStatus status = EnumCashBackActivityRecordStatus.getEnum(auditStatus); | ||||
| if (null != status ) { | 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) { | if (null != itemMap) { | ||||
| for (Iterator<Long> it = itemMap.keySet().iterator();it.hasNext();) { | for (Iterator<Long> it = itemMap.keySet().iterator();it.hasNext();) { | ||||
| Long itemId = it.next(); | Long itemId = it.next(); | ||||
| WxRaffleActivityItem item = itemMap.get(itemId); | WxRaffleActivityItem item = itemMap.get(itemId); | ||||
| if (null != recordItemIdList && recordItemIdList.contains(itemId)) { | if (null != recordItemIdList && recordItemIdList.contains(itemId)) { | ||||
| excelObject.put(item.getName(), 1); | |||||
| excelObject.put(String.valueOf(item.getId()), 1); | |||||
| }else { | }else { | ||||
| excelObject.put(item.getName(), 0); | |||||
| excelObject.put(String.valueOf(item.getId()), 0); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -69,7 +69,9 @@ public interface WxRaffleActivityService { | |||||
| List<WxRaffleActivityMerchant> getActivityMerchants(Long activityId,String tenantId,boolean hasMerchantInfo); | List<WxRaffleActivityMerchant> getActivityMerchants(Long activityId,String tenantId,boolean hasMerchantInfo); | ||||
| void exportData(List objectList,String sheetName,Class objectCalss,HttpServletRequest request, HttpServletResponse response); | void exportData(List objectList,String sheetName,Class objectCalss,HttpServletRequest request, HttpServletResponse response); | ||||
| void exportData(List<Map<String,Object>> objectList,String fileName,HttpServletRequest request, HttpServletResponse response); | |||||
| void exportData(Map<String,String> titleMap,List<Map<String,Object>> objectList,String fileName,String sheetName,HttpServletRequest request, HttpServletResponse response); | |||||
| Map<Long,WxRaffleActivityItem> getItemMap(TenantEntity tenantEntity,List<Long> activitIds); | |||||
| void auditRecord(WxRaffleActivityRecord record); | void auditRecord(WxRaffleActivityRecord record); | ||||
| @@ -192,8 +192,8 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { | |||||
| } | } | ||||
| } | } | ||||
| private Map<Long,WxRaffleActivityItem> getItemMap(TenantEntity tenantEntity,List<Long> activitIds) { | |||||
| @Override | |||||
| public Map<Long,WxRaffleActivityItem> getItemMap(TenantEntity tenantEntity,List<Long> activitIds) { | |||||
| WxRaffleActivityItem iq = new WxRaffleActivityItem(); | WxRaffleActivityItem iq = new WxRaffleActivityItem(); | ||||
| iq.updateTenantInfo(tenantEntity); | iq.updateTenantInfo(tenantEntity); | ||||
| iq.setActivityIdList(activitIds); | iq.setActivityIdList(activitIds); | ||||
| @@ -384,9 +384,9 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void exportData(List<Map<String, Object>> objectList, String fileName, HttpServletRequest request, | |||||
| public void exportData(Map<String,String> titleMap,List<Map<String, Object>> objectList, String fileName,String sheetName, HttpServletRequest request, | |||||
| HttpServletResponse response) { | HttpServletResponse response) { | ||||
| excelService.exportExcel(objectList, fileName, response); | |||||
| excelService.exportExcel(titleMap,objectList, fileName,sheetName, response); | |||||
| } | } | ||||
| @Override | @Override | ||||