diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java index 354eddbbe..e299767f3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java @@ -85,7 +85,7 @@ public class WxOfflineActivitySettlementController extends BaseController { @ApiOperation("单个活动结算列表") @GetMapping("activitySettlement") @ApiImplicitParams({}) - public ResultData activitySettlement(@ModelAttribute WxOfflineActivityGrantSettlement grantSettlement) { + public ResultData activitySettlement(@ModelAttribute OfflineActivitySettlement grantSettlement) { if(grantSettlement.getActivityId() == null){ return new ResultData(Result.ERROR,"请选择活动"); @@ -101,7 +101,7 @@ public class WxOfflineActivitySettlementController extends BaseController { @ApiOperation("单个活动单个门店结算汇总") @GetMapping("merchantSettlementStatistics") @ApiImplicitParams({}) - public ResultData merchantSettlementStatistics(@ModelAttribute WxOfflineActivityGrantSettlement grantSettlement) { + public ResultData merchantSettlementStatistics(@ModelAttribute OfflineActivitySettlement grantSettlement) { if(grantSettlement.getActivityId() == null){ return new ResultData(Result.ERROR,"请选择活动"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java index a782fd0a0..b53e6fbc8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java @@ -153,6 +153,7 @@ public class WxOfflineActivityRecord extends TenantEntity { /** * 审批意见 */ + @Excel(name = "审核意见", width = 20, orderNum = "9") @TableField(value = "audit_remark") private String auditRemark; @@ -169,12 +170,14 @@ public class WxOfflineActivityRecord extends TenantEntity { @TableField(value = "audit_by") private Long auditBy; + @Excel(name = "审核人", width = 20, orderNum = "11") @TableField(exist = false) private String auditByName; /** * 审核时间 */ + @Excel(name = "审核意见", width = 20, format = "yyyy-MM-dd HH:mm:ss", orderNum = "10") @TableField(value = "audit_time") private Date auditTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivitySettlement.java b/mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivitySettlement.java index 7f6f80cdc..c1cd8cd96 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivitySettlement.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivitySettlement.java @@ -1,5 +1,6 @@ package com.iformall.domain.vo; +import com.iformall.common.SortColumn; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @@ -10,13 +11,21 @@ import java.util.List; @Data public class OfflineActivitySettlement extends TenantEntity { + private Long id; + private List merchantIdList; + private Long activityId; private Long merchantId; private String merchantName; + @SortColumn(column = "recordCount") private Integer recordCount; + @SortColumn(column = "sumOrderMoney") private BigDecimal sumOrderMoney; + @SortColumn(column = "sumGrantPrice") private BigDecimal sumGrantPrice; + @SortColumn(column = "sumMallPrice") private BigDecimal sumMallPrice; + @SortColumn(column = "sumMerchantPrice") private BigDecimal sumMerchantPrice; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantSettlementMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantSettlementMapper.java index 607084668..659345249 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantSettlementMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantSettlementMapper.java @@ -21,7 +21,7 @@ public interface WxOfflineActivityGrantSettlementMapper extends CommonMapper getActivitySettlement(WxOfflineActivityGrantSettlement settlement); + List getActivitySettlement(OfflineActivitySettlement settlement); List findList(WxOfflineActivityGrantSettlement settlement); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java index 3fb8993ad..dbea00751 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java @@ -26,9 +26,9 @@ public interface WxOfflineActivityGrantSettlementService { PageInfo activityListAsPage(WxOfflineActivity wxOfflineActivity, Integer pageNum, Integer pageSize); - List getActivitySettlement(WxOfflineActivityGrantSettlement grantSettlement); + List getActivitySettlement(OfflineActivitySettlement grantSettlement); - Map merchantSettlementStatistics(WxOfflineActivityGrantSettlement grantSettlement); + Map merchantSettlementStatistics(OfflineActivitySettlement grantSettlement); List findList(WxOfflineActivityGrantSettlement grantSettlement); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 0c5fbbc68..7befddf3f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -513,7 +513,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity handlerRecordQuery(wxOfflineActivityRecord); List recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); handlerRecordList(wxOfflineActivityRecord,recordList); - excelService.exportExcel(recordList, null, "用户参加活动订单列表", WxOfflineActivityGrantSettlement.class, "用户参加活动订单列表.xlsx", response, false); + excelService.exportExcel(recordList, null, "用户参加活动订单列表", WxOfflineActivityRecord.class, "用户参加活动订单列表.xlsx", response, false); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java index ec619c647..9671d8546 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java @@ -245,7 +245,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct } @Override - public List getActivitySettlement(WxOfflineActivityGrantSettlement record) { + public List getActivitySettlement(OfflineActivitySettlement record) { if (StringUtils.isNotBlank(record.getMerchantName())) { WxMerchant merchant = new WxMerchant(); @@ -275,7 +275,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct } @Override - public Map merchantSettlementStatistics(WxOfflineActivityGrantSettlement grantSettlement) { + public Map merchantSettlementStatistics(OfflineActivitySettlement grantSettlement) { Map result = new HashMap<>(); WxOfflineActivity activity = wxOfflineActivityMapper.selectById(grantSettlement.getActivityId(),grantSettlement.getTenantId()); if(activity == null){ @@ -300,10 +300,10 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct }else{ OfflineActivitySettlement offlineActivitySettlement = activitySettlementList.get(0); result.put("recordCount",offlineActivitySettlement.getRecordCount()); - result.put("sumOrderMoney",offlineActivitySettlement.getRecordCount()); - result.put("sumGrantPrice",offlineActivitySettlement.getRecordCount()); - result.put("sumMallPrice",offlineActivitySettlement.getRecordCount()); - result.put("sumMerchantPrice",offlineActivitySettlement.getRecordCount()); + result.put("sumOrderMoney",offlineActivitySettlement.getSumOrderMoney()); + result.put("sumGrantPrice",offlineActivitySettlement.getSumGrantPrice()); + result.put("sumMallPrice",offlineActivitySettlement.getSumMallPrice()); + result.put("sumMerchantPrice",offlineActivitySettlement.getSumMerchantPrice()); } return result; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java index 8c8c70f1e..c6ca2ad68 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java @@ -109,8 +109,15 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(tenantEntity); Map idAndNamesMap = wxMerchantService.getIdAndNamesMap(merchantQ); + MallUserInfo userInfoQ = new MallUserInfo(); + userInfoQ.updateTenantInfo(tenantEntity); + Map userMap = mallUserInfoService.getUserMap(userInfoQ); + for (WxOfflineActivityRecord record : recordList) { record.setMerchantName(idAndNamesMap.get(record.getMerchantId())); + if(record.getAuditBy() != null){ + record.setAuditByName(userMap.get(record.getAuditBy()).getName()); + } } } diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml index ca0775a34..dca024453 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml @@ -152,7 +152,7 @@ - SELECT merchant_id as 'merchantId', activity_id as 'activityId', count(record_id) as 'recordCount', @@ -171,14 +171,6 @@ and `parent_tenant_id` = #{parentTenantId} - - - and `create_date` >= #{createDateBegin} - - - - and `create_date` <= #{createDateEnd} - and `merchant_id` = #{merchantId}