|
|
|
@@ -629,14 +629,14 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
wxOfflineActivityGrantAwardMapper.insert(wxOfflineActivityGrantAward); |
|
|
|
|
|
|
|
//失效 |
|
|
|
WxOfflineActivityGrantAward upd = new WxOfflineActivityGrantAward(); |
|
|
|
upd.setId(wxOfflineActivityGrantAward.getId()); |
|
|
|
upd.updateTenantInfo(wxOfflineActivityGrantAward); |
|
|
|
upd.setStatus(EnumYesOrNo.NO.getCode()); |
|
|
|
upd.setActivityId(activity.getId()); |
|
|
|
upd.setCusPhone(wxOfflineActivityGrantAward.getCusPhone()); |
|
|
|
upd.setUpdateDate(now); |
|
|
|
wxOfflineActivityGrantAwardMapper.updateStatusNo(upd); |
|
|
|
// WxOfflineActivityGrantAward upd = new WxOfflineActivityGrantAward(); |
|
|
|
// upd.setId(wxOfflineActivityGrantAward.getId()); |
|
|
|
// upd.updateTenantInfo(wxOfflineActivityGrantAward); |
|
|
|
// upd.setStatus(EnumYesOrNo.NO.getCode()); |
|
|
|
// upd.setActivityId(activity.getId()); |
|
|
|
// upd.setCusPhone(wxOfflineActivityGrantAward.getCusPhone()); |
|
|
|
// upd.setUpdateDate(now); |
|
|
|
// wxOfflineActivityGrantAwardMapper.updateStatusNo(upd); |
|
|
|
|
|
|
|
//创建订单关联 |
|
|
|
wxOfflineActivityRecordGrantService.insertFromGrantAward(wxOfflineActivityGrantAward); |
|
|
|
@@ -1883,9 +1883,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
} |
|
|
|
|
|
|
|
if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){ |
|
|
|
WxOfflineActivityAwardsModel activityAwardsModel = wxOfflineActivityAwardsModelMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId()); |
|
|
|
if(activityAwardsModel == null || !activityAwardsModel.getActivityItemId().equals(activityItem.getId())){ |
|
|
|
throw new MallinkException(Result.ERROR, "查询活动数据异常"); |
|
|
|
WxOfflineActivityAwardsModel activityAwardsModel = null; |
|
|
|
if(offlineActivityAwardsItemVo.getId() != null){ |
|
|
|
activityAwardsModel = wxOfflineActivityAwardsModelMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId()); |
|
|
|
} |
|
|
|
grantItemLotteryDrawExport(request,response,activityItem,activityAwardsModel); |
|
|
|
|
|
|
|
@@ -1894,16 +1894,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
// if(activityAwardsModel == null || !activityAwardsModel.getActivityItemId().equals(activityItem.getId())){ |
|
|
|
// throw new MallinkException(Result.ERROR, "查询活动数据异常"); |
|
|
|
// } |
|
|
|
WxOfflineActivityAwardsItem wxOfflineActivityAwardsItem = wxOfflineActivityAwardsItemMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId()); |
|
|
|
if(wxOfflineActivityAwardsItem == null || !wxOfflineActivityAwardsItem.getActivityItemId().equals(activityItem.getId())){ |
|
|
|
throw new MallinkException(Result.ERROR, "查询活动数据异常"); |
|
|
|
WxOfflineActivityAwardsItem wxOfflineActivityAwardsItem = null; |
|
|
|
if(offlineActivityAwardsItemVo.getId() != null){ |
|
|
|
wxOfflineActivityAwardsItem = wxOfflineActivityAwardsItemMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId()); |
|
|
|
} |
|
|
|
grantItemGiftExport(request,response,activityItem,wxOfflineActivityAwardsItem); |
|
|
|
|
|
|
|
} else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) { |
|
|
|
WxOfflineActivityAwardsItem wxOfflineActivityAwardsItem = wxOfflineActivityAwardsItemMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId()); |
|
|
|
if(wxOfflineActivityAwardsItem == null || !wxOfflineActivityAwardsItem.getActivityItemId().equals(activityItem.getId())){ |
|
|
|
throw new MallinkException(Result.ERROR, "查询活动数据异常"); |
|
|
|
WxOfflineActivityAwardsItem wxOfflineActivityAwardsItem = null; |
|
|
|
if(offlineActivityAwardsItemVo.getId() != null){ |
|
|
|
wxOfflineActivityAwardsItem = wxOfflineActivityAwardsItemMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId()); |
|
|
|
} |
|
|
|
grantItemCashbackExport(request,response,activityItem,wxOfflineActivityAwardsItem); |
|
|
|
|
|
|
|
@@ -1942,7 +1942,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement(); |
|
|
|
grantSettlement.updateTenantInfo(activityItem); |
|
|
|
grantSettlement.setActivityItemId(activityItem.getId()); |
|
|
|
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantCountList(grantSettlement); |
|
|
|
grantSettlement.setGrantAwardsMode(EnumOfflineActivityAwardsModeType.COUNT.getCode()); |
|
|
|
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement); |
|
|
|
if(grantItemList != null && !grantItemList.isEmpty()){ |
|
|
|
Map<Long, List<String>> grantItemRecordMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getGrantItemId,Collectors.mapping(OfflineActivityGrantItemVo::getOrderNo,Collectors.toList()))); |
|
|
|
|
|
|
|
@@ -2103,8 +2104,11 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement(); |
|
|
|
grantSettlement.updateTenantInfo(activityItem); |
|
|
|
grantSettlement.setActivityItemId(activityItem.getId()); |
|
|
|
grantSettlement.setMinMoney(activityAwardsModel.getMinAmount()); |
|
|
|
grantSettlement.setMaxMoney(activityAwardsModel.getMaxAmount()); |
|
|
|
grantSettlement.setGrantAwardsMode(EnumOfflineActivityAwardsModeType.AMOUNT.getCode()); |
|
|
|
if(activityAwardsModel != null){ |
|
|
|
grantSettlement.setMinMoney(activityAwardsModel.getMinAmount()); |
|
|
|
grantSettlement.setMaxMoney(activityAwardsModel.getMaxAmount()); |
|
|
|
} |
|
|
|
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement); |
|
|
|
if(grantItemList != null && !grantItemList.isEmpty()){ |
|
|
|
grantItemMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getRecordId)); |
|
|
|
@@ -2113,12 +2117,14 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
Map<Long, Long> grantItemSizeMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getRecordId, counting())); |
|
|
|
Long maxGrantItemSize = Collections.max(grantItemSizeMap.values()); |
|
|
|
for (int i = 0; i < maxGrantItemSize.intValue(); i++) { |
|
|
|
ExcelExportEntity entity_1 = new ExcelExportEntity("订单奖品名称","awardName_"+i,20); |
|
|
|
ExcelExportEntity entity_1 = new ExcelExportEntity("奖品名称","awardName_"+i,20); |
|
|
|
exportHead.add(entity_1); |
|
|
|
ExcelExportEntity entity_2 = new ExcelExportEntity("订单奖品数量","awardCount_"+i,20); |
|
|
|
ExcelExportEntity entity_2 = new ExcelExportEntity("奖品数量","awardCount_"+i,20); |
|
|
|
exportHead.add(entity_2); |
|
|
|
ExcelExportEntity entity_3 = new ExcelExportEntity("订单奖品价值","awardPrice_"+i,20); |
|
|
|
ExcelExportEntity entity_3 = new ExcelExportEntity("奖品价值","awardPrice_"+i,20); |
|
|
|
exportHead.add(entity_3); |
|
|
|
ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担价值","realGrantPrice"+i,20); |
|
|
|
exportHead.add(entity_3_); |
|
|
|
ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate_"+i,20); |
|
|
|
exportHead.add(entity_4); |
|
|
|
ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate_"+i,20); |
|
|
|
@@ -2151,6 +2157,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
grantItemObject.put("awardName_"+i,grantItem.getAwardName()); |
|
|
|
grantItemObject.put("awardCount_"+i,grantItem.getAwardCount()); |
|
|
|
grantItemObject.put("awardPrice_"+i,grantItem.getAwardPrice()); |
|
|
|
grantItemObject.put("realGrantPrice_"+i,grantItem.getRealGrantPrice()); |
|
|
|
grantItemObject.put("mallShareRate_"+i,grantItem.getMallShareRate()); |
|
|
|
grantItemObject.put("merchantShareRate_"+i,grantItem.getMerchantShareRate()); |
|
|
|
grantItemObject.put("realMallSharePrice_"+i,grantItem.getRealMallSharePrice()); |
|
|
|
@@ -2173,17 +2180,22 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement(); |
|
|
|
grantSettlement.updateTenantInfo(activityItem); |
|
|
|
grantSettlement.setActivityItemId(activityItem.getId()); |
|
|
|
grantSettlement.setAwardItamId(wxOfflineActivityAwardsItem.getId()); |
|
|
|
grantSettlement.setGrantAwardsMode(EnumOfflineActivityAwardsModeType.AMOUNT.getCode()); |
|
|
|
if(wxOfflineActivityAwardsItem != null){ |
|
|
|
grantSettlement.setAwardItamId(wxOfflineActivityAwardsItem.getId()); |
|
|
|
} |
|
|
|
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement); |
|
|
|
if(grantItemList != null && !grantItemList.isEmpty()){ |
|
|
|
|
|
|
|
//订单表头 |
|
|
|
ExcelExportEntity entity_1 = new ExcelExportEntity("订单奖品名称","awardName",20); |
|
|
|
ExcelExportEntity entity_1 = new ExcelExportEntity("奖品名称","awardName",20); |
|
|
|
exportHead.add(entity_1); |
|
|
|
ExcelExportEntity entity_2 = new ExcelExportEntity("订单奖品数量","awardCount",20); |
|
|
|
ExcelExportEntity entity_2 = new ExcelExportEntity("奖品数量","awardCount",20); |
|
|
|
exportHead.add(entity_2); |
|
|
|
ExcelExportEntity entity_3 = new ExcelExportEntity("订单奖品价值","awardPrice",20); |
|
|
|
ExcelExportEntity entity_3 = new ExcelExportEntity("奖品价值","awardPrice",20); |
|
|
|
exportHead.add(entity_3); |
|
|
|
ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担价值","realGrantPrice",20); |
|
|
|
exportHead.add(entity_3_); |
|
|
|
ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); |
|
|
|
exportHead.add(entity_4); |
|
|
|
ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20); |
|
|
|
@@ -2210,6 +2222,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
grantItemObject.put("awardName",grantItem.getAwardName()); |
|
|
|
grantItemObject.put("awardCount",grantItem.getAwardCount()); |
|
|
|
grantItemObject.put("awardPrice",grantItem.getAwardPrice()); |
|
|
|
grantItemObject.put("realGrantPrice",grantItem.getRealGrantPrice()); |
|
|
|
grantItemObject.put("mallShareRate",grantItem.getMallShareRate()); |
|
|
|
grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); |
|
|
|
grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice()); |
|
|
|
@@ -2232,18 +2245,23 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement(); |
|
|
|
grantSettlement.updateTenantInfo(activityItem); |
|
|
|
grantSettlement.setActivityItemId(activityItem.getId()); |
|
|
|
grantSettlement.setAwardItamId(wxOfflineActivityAwardsItem.getId()); |
|
|
|
grantSettlement.setGrantAwardsMode(EnumOfflineActivityAwardsModeType.AMOUNT.getCode()); |
|
|
|
if(wxOfflineActivityAwardsItem != null){ |
|
|
|
grantSettlement.setAwardItamId(wxOfflineActivityAwardsItem.getId()); |
|
|
|
} |
|
|
|
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement); |
|
|
|
if(grantItemList != null && !grantItemList.isEmpty()){ |
|
|
|
//订单表头 |
|
|
|
ExcelExportEntity entity_1 = new ExcelExportEntity("订单返现名称","awardName",20); |
|
|
|
ExcelExportEntity entity_1 = new ExcelExportEntity("返现名称","awardName",20); |
|
|
|
exportHead.add(entity_1); |
|
|
|
// ExcelExportEntity entity_2 = new ExcelExportEntity("数量","awardCount",20); |
|
|
|
// exportHead.add(entity_2); |
|
|
|
ExcelExportEntity entity_2 = new ExcelExportEntity("订单返现比例(%)","cashBackRatio",20); |
|
|
|
ExcelExportEntity entity_2 = new ExcelExportEntity("返现比例(%)","cashBackRatio",20); |
|
|
|
exportHead.add(entity_2); |
|
|
|
ExcelExportEntity entity_3 = new ExcelExportEntity("订单返现金额","awardPrice",20); |
|
|
|
ExcelExportEntity entity_3 = new ExcelExportEntity("返现金额","awardPrice",20); |
|
|
|
exportHead.add(entity_3); |
|
|
|
ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担金额","realGrantPrice",20); |
|
|
|
exportHead.add(entity_3_); |
|
|
|
ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); |
|
|
|
exportHead.add(entity_4); |
|
|
|
ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20); |
|
|
|
@@ -2252,14 +2270,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
exportHead.add(entity_6); |
|
|
|
ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice",20); |
|
|
|
exportHead.add(entity_7); |
|
|
|
ExcelExportEntity entity_8 = new ExcelExportEntity("税点金额起点","startingTaxPoint",20); |
|
|
|
exportHead.add(entity_8); |
|
|
|
ExcelExportEntity entity_9 = new ExcelExportEntity("税点比例(%)","taxPoints",20); |
|
|
|
exportHead.add(entity_9); |
|
|
|
ExcelExportEntity entity_10 = new ExcelExportEntity("税点金额","taxPointsAmount",20); |
|
|
|
exportHead.add(entity_10); |
|
|
|
ExcelExportEntity entity_11 = new ExcelExportEntity("实际返现金额","realCashBackPrice",20); |
|
|
|
exportHead.add(entity_11); |
|
|
|
if(EnumOfflineActivityMode.ONE.getCode().equals(activityItem.getModeType())){ |
|
|
|
ExcelExportEntity entity_8 = new ExcelExportEntity("税点金额起点","startingTaxPoint",20); |
|
|
|
exportHead.add(entity_8); |
|
|
|
ExcelExportEntity entity_9 = new ExcelExportEntity("税点比例(%)","taxPoints",20); |
|
|
|
exportHead.add(entity_9); |
|
|
|
ExcelExportEntity entity_10 = new ExcelExportEntity("税点金额","taxPointsAmount",20); |
|
|
|
exportHead.add(entity_10); |
|
|
|
ExcelExportEntity entity_11 = new ExcelExportEntity("实际返现金额","realCashBackPrice",20); |
|
|
|
exportHead.add(entity_11); |
|
|
|
} |
|
|
|
|
|
|
|
List<Long> recordIds = grantItemList.stream().map(OfflineActivityGrantItemVo::getRecordId).distinct().collect(toList()); |
|
|
|
List<Long> grantIds = grantItemList.stream().map(OfflineActivityGrantItemVo::getGrantId).distinct().collect(toList()); |
|
|
|
@@ -2279,15 +2299,17 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
// grantItemObject.put("awardCount",grantItem.getAwardCount()); |
|
|
|
grantItemObject.put("cashBackRatio",grantItem.getCashBackRatio()); |
|
|
|
grantItemObject.put("awardPrice",grantItem.getAwardPrice()); |
|
|
|
grantItemObject.put("realGrantPrice",grantItem.getRealGrantPrice()); |
|
|
|
grantItemObject.put("mallShareRate",grantItem.getMallShareRate()); |
|
|
|
grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); |
|
|
|
grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice()); |
|
|
|
grantItemObject.put("realMerchantSharePrice",grantItem.getRealMerchantSharePrice()); |
|
|
|
|
|
|
|
grantItemObject.put("startingTaxPoint",grantItem.getStartingTaxPoint()); |
|
|
|
grantItemObject.put("taxPoints",grantItem.getTaxPoints()); |
|
|
|
grantItemObject.put("taxPointsAmount",grantItem.getTaxPointsAmount()); |
|
|
|
if(grantItem.getTaxPointsAmount() != null){ |
|
|
|
grantItemObject.put("realCashBackPrice",grantItem.getAwardPrice().subtract(grantItem.getTaxPointsAmount())); |
|
|
|
grantItemObject.put("realCashBackPrice",grantItem.getRealGrantPrice().subtract(grantItem.getTaxPointsAmount())); |
|
|
|
}else{ |
|
|
|
grantItemObject.put("realCashBackPrice",grantItem.getAwardPrice()); |
|
|
|
} |
|
|
|
@@ -2321,11 +2343,14 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
ExcelExportEntity entity10 = new ExcelExportEntity("提交时间","createDate",20); |
|
|
|
entity10.setFormat("yyyy-MM-dd HH:mm:ss"); |
|
|
|
headList.add(entity10); |
|
|
|
ExcelExportEntity entity11 = new ExcelExportEntity("审核人","auditByName",20); |
|
|
|
ExcelExportEntity entity11 = new ExcelExportEntity("订单状态","auditStatus",20); |
|
|
|
entity11.setReplace(new String[]{"审核中_0", "已审批_1", "已驳回_2", "已退单_3", "已发奖_10"}); |
|
|
|
headList.add(entity11); |
|
|
|
ExcelExportEntity entity12 = new ExcelExportEntity("审核时间","auditTime",20); |
|
|
|
entity12.setFormat("yyyy-MM-dd HH:mm:ss"); |
|
|
|
ExcelExportEntity entity12 = new ExcelExportEntity("审核人","auditByName",20); |
|
|
|
headList.add(entity12); |
|
|
|
ExcelExportEntity entity13 = new ExcelExportEntity("审核时间","auditTime",20); |
|
|
|
entity13.setFormat("yyyy-MM-dd HH:mm:ss"); |
|
|
|
headList.add(entity13); |
|
|
|
|
|
|
|
|
|
|
|
ExcelExportEntity entity20 = new ExcelExportEntity("客户姓名","cusName",20); |
|
|
|
@@ -2364,6 +2389,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
grantItemObject.put("lotteryCount",record.getLotteryCount()); |
|
|
|
grantItemObject.put("anniversaryLotteryNum",record.getAnniversaryLotteryNum()); |
|
|
|
grantItemObject.put("createDate",record.getCreateDate()); |
|
|
|
grantItemObject.put("auditStatus",record.getAuditStatus()); |
|
|
|
grantItemObject.put("auditByName",record.getAuditByName()); |
|
|
|
grantItemObject.put("auditTime",record.getAuditTime()); |
|
|
|
|
|
|
|
|