From 78e25cba6567bfc6326eae6ce5664554b80123d9 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 22:13:26 +0800 Subject: [PATCH] fix --- .../market/WxRaffleActivityController.java | 20 +++++--- .../WxRaffleActivityController.java | 2 +- .../domain/po/WxCashBackActivityRecord.java | 2 +- .../domain/po/WxRaffleActivityRecord.java | 51 ++++++++++++++++++- .../EnumCashBackActivityRecordStatus.java | 3 +- .../service/WxRaffleActivityService.java | 3 +- .../impl/WxRaffleActivityServiceImpl.java | 27 ++++++++-- 7 files changed, 91 insertions(+), 17 deletions(-) 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 4041ea1bd..bc7a1bb4c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java @@ -234,7 +234,7 @@ public class WxRaffleActivityController extends BaseController { TenantEntity tenantInfo = getTenantInfo(); wxCashBackActivityRecord.updateTenantInfo(tenantInfo); wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); - final PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize); + final PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize,null); return new ResultData(page); } @@ -244,14 +244,20 @@ public class WxRaffleActivityController extends BaseController { TenantEntity tenantInfo = getTenantInfo(); wxCashBackActivityRecord.updateTenantInfo(tenantInfo); wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); - PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000); - List result = null; - if (null != page && null != page.getList()) { - result = page.getList(); + if (null != wxCashBackActivityRecord.getActivityId()) { + List> oneActivityExeclList = new ArrayList>(); + PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000,oneActivityExeclList); + wxCashBackActivityService.exportData(oneActivityExeclList, "线下抽奖记录", request, response); }else { - result = new ArrayList(); + PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, 1, 10000,null); + List result = null; + if (null != page && null != page.getList()) { + result = page.getList(); + }else { + result = new ArrayList(); + } + wxCashBackActivityService.exportData(result,"线下抽奖记录",WxRaffleActivityRecord.class, request, response); } - wxCashBackActivityService.exportData(result,"线下抽奖记录",WxRaffleActivityRecord.class, request, response); } @ApiOperation("查询当前提现信息") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java index 22ed66aae..030166571 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java @@ -113,7 +113,7 @@ public class WxRaffleActivityController extends BaseController { wxCashBackActivityRecord.updateTenantInfo(tenantInfo); wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); wxCashBackActivityRecord.setMerchantId(getLoginBUser().getMerchantId()); - final PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize); + final PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize,null); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java index 38153cab1..c7c698370 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java @@ -51,7 +51,7 @@ public class WxCashBackActivityRecord extends TenantEntity { @Excel(name="客户地址",width = 20,orderNum = "8") @io.swagger.annotations.ApiModelProperty(value = "客户地址", name = "address") private String address; - @Excel(name="状态",width = 20,replace = {"审核中_0", "审核通过_1", "审核驳回_2"},orderNum = "9") + @Excel(name="状态",width = 20,replace = {"审核中_0", "审核通过_1", "审核驳回_2","已退单_3"},orderNum = "9") @io.swagger.annotations.ApiModelProperty(value = "EnumCashBackActivityRecordStatus", name = "auditStatus") private Integer auditStatus; @TableField(exist = false) 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 428ae4f98..322f64e76 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java @@ -3,6 +3,8 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumCashBackActivityRecordStatus; +import com.iformall.utils.DateUtils; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; @@ -10,8 +12,12 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; @TableName(value = "wx_raffle_activity_record") @Data @@ -46,7 +52,7 @@ public class WxRaffleActivityRecord extends TenantEntity { @Excel(name="客户地址",width = 20,orderNum = "8") @io.swagger.annotations.ApiModelProperty(value = "客户地址", name = "address") private String address; - @Excel(name="状态",width = 20,replace = {"审核中_0", "审核通过_1", "审核驳回_2"},orderNum = "9") + @Excel(name="状态",width = 20,replace = {"审核中_0", "审核通过_1", "审核驳回_2","已退单_3"},orderNum = "9") @io.swagger.annotations.ApiModelProperty(value = "EnumCashBackActivityRecordStatus", name = "auditStatus") private Integer auditStatus; @TableField(exist = false) @@ -76,6 +82,8 @@ public class WxRaffleActivityRecord extends TenantEntity { @TableField(exist = false) private List recordItemList; + @TableField(exist = false) + private List recordItemIdList; public String generateItemDetaiJson() { if (null != recordItemList && recordItemList.size() > 0 ) { @@ -91,4 +99,45 @@ public class WxRaffleActivityRecord extends TenantEntity { return null; } + public List generateItemIds() { + if (null != recordItemList && recordItemList.size() > 0 ) { + List itemIdList = new ArrayList(); + for (int i = 0 ; i < recordItemList.size() ; i++) { + WxRaffleActivityRecordItem ri = recordItemList.get(i); + itemIdList.add(ri.getId()); + } + return itemIdList; + } + return null; + } + + 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); + EnumCashBackActivityRecordStatus status = EnumCashBackActivityRecordStatus.getEnum(auditStatus); + if (null != status ) { + excelObject.put("状态", status.getMessage()); + } + excelObject.put("审核内容", auditRemark); + excelObject.put("提交时间", 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); + }else { + excelObject.put(item.getName(), 0); + } + } + } + return excelObject; + } + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityRecordStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityRecordStatus.java index 0f3f3e709..ceb891368 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityRecordStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCashBackActivityRecordStatus.java @@ -8,7 +8,8 @@ public enum EnumCashBackActivityRecordStatus { AUDTING(0, "审核中"), AUDI_SUCCESS(1, "审批通过"), - AUDT_FAIL(2, "审批拒绝"); + AUDT_FAIL(2, "审批拒绝"), + AUDT_REFUND(3, "退单"); public static EnumCashBackActivityRecordStatus getEnum(Integer code) { for (EnumCashBackActivityRecordStatus value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java index 57d59cbbb..1341ddaf6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java @@ -30,7 +30,7 @@ public interface WxRaffleActivityService { PageInfo listActivityItemAsPage(WxRaffleActivityItem record, Integer pageIndex, Integer pageSize); - PageInfo listActivityRecordAsPage(WxRaffleActivityRecord record, Integer pageIndex, Integer pageSize); + PageInfo listActivityRecordAsPage(WxRaffleActivityRecord record, Integer pageIndex, Integer pageSize,List> oneActivityExeclList); int getItemCount(WxRaffleActivity record); int getRecordCount(WxRaffleActivityRecord record); @@ -69,6 +69,7 @@ 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 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 763a4aac1..88a7b7b59 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -120,17 +120,16 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { } @Override - public PageInfo listActivityRecordAsPage(WxRaffleActivityRecord record, - Integer pageIndex, Integer pageSize) { + public PageInfo listActivityRecordAsPage(WxRaffleActivityRecord record,Integer pageIndex, Integer pageSize,List> oneActivityExeclList) { initRecordQueryParam(record); PageInfo recordPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityRecordMapper.findList(record)); if (null != recordPage && null != recordPage.getList()) { - handerRecordPageData(record,recordPage.getList()); + handerRecordPageData(record,recordPage.getList(),oneActivityExeclList,record.getActivityId()); } return recordPage; } - private void handerRecordPageData(TenantEntity tenantEntity,List recordList) { + private void handerRecordPageData(TenantEntity tenantEntity,List recordList,List> oneActivityExeclList,Long oneAcitvityId) { if (null == recordList || recordList.size() <=0 ) { return; } @@ -162,6 +161,13 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { } } + Map itemMap = null; + if (null != oneActivityExeclList && null != oneAcitvityId) { + List _aids = new ArrayList(); + _aids.add(oneAcitvityId); + itemMap = getItemMap(tenantEntity,_aids); + } + for (WxRaffleActivityRecord _r : recordList) { if (null != _r.getActivityId()) { WxRaffleActivity _a = activityMap.get(_r.getActivityId()); @@ -178,9 +184,15 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { } _r.setRecordItemList(getActivityRecordItemListByRecordId(aidList,_r.getId(),_r)); _r.setItemDetail(_r.generateItemDetaiJson()); + + if (null != oneActivityExeclList && null != oneAcitvityId) { + _r.setRecordItemIdList(_r.generateItemIds()); + oneActivityExeclList.add(_r.generateExcelData(itemMap)); + } } } + private Map getItemMap(TenantEntity tenantEntity,List activitIds) { WxRaffleActivityItem iq = new WxRaffleActivityItem(); iq.updateTenantInfo(tenantEntity); @@ -370,6 +382,12 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { public void exportData(List objectList,String sheetName,Class objectCalss,HttpServletRequest request, HttpServletResponse response) { excelService.exportExcel(objectList, null, sheetName, objectCalss, sheetName+".xlsx", response, false); } + + @Override + public void exportData(List> objectList, String fileName, HttpServletRequest request, + HttpServletResponse response) { + excelService.exportExcel(objectList, fileName, response); + } @Override public void auditRecord(WxRaffleActivityRecord record) { @@ -479,5 +497,4 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { } return _riList; } - }