|
|
|
@@ -322,9 +322,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
if(record.getCreateDate().before(activity.getStartTime()) || record.getCreateDate().after(activity.getEndTime())){ |
|
|
|
throw new MallinkException(Result.ERROR, "请检查活动时间"); |
|
|
|
} |
|
|
|
if(wxOfflineActivityRecordGrantMapper.selectGrantCount(activity.getTenantId(),activity.getId(),record.getId()) > 0){ |
|
|
|
throw new MallinkException(Result.ERROR, "请检查订单是否已参与活动"); |
|
|
|
} |
|
|
|
// if(wxOfflineActivityRecordGrantMapper.selectGrantCount(activity.getTenantId(),activity.getId(),record.getId()) > 0){ |
|
|
|
// throw new MallinkException(Result.ERROR, "请检查订单是否已参与活动"); |
|
|
|
// } |
|
|
|
|
|
|
|
orderMoneySum = orderMoneySum.add(record.getOrderMoney()); |
|
|
|
if(record.getLotteryNumList() != null && !record.getLotteryNumList().isEmpty()){ |
|
|
|
@@ -548,37 +548,43 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public WxOfflineActivityGrantAward grantAwardDetail(WxOfflineActivityGrantAward wxOfflineActivityGrantAward) { |
|
|
|
Long grantId = wxOfflineActivityRecordGrantMapper.selectGrantId(wxOfflineActivityGrantAward.getTenantId(),wxOfflineActivityGrantAward.getActivityId(),wxOfflineActivityGrantAward.getRecordId()); |
|
|
|
if(grantId == null){ |
|
|
|
public List<WxOfflineActivityGrantAward> grantAwardDetail(WxOfflineActivityGrantAward wxOfflineActivityGrantAward) { |
|
|
|
List<Long> grantIds = wxOfflineActivityRecordGrantMapper.selectGrantId(wxOfflineActivityGrantAward.getTenantId(),wxOfflineActivityGrantAward.getActivityId(),wxOfflineActivityGrantAward.getRecordId()); |
|
|
|
if(grantIds == null || grantIds.isEmpty()){ |
|
|
|
return null; |
|
|
|
} |
|
|
|
WxOfflineActivityGrantAward grantAward = wxOfflineActivityGrantAwardMapper.selectById(grantId,wxOfflineActivityGrantAward.getTenantId()); |
|
|
|
//获取奖项 |
|
|
|
List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(grantAward.getActivityId(), grantAward.getTenantId()); |
|
|
|
grantAward.setActivityItemList(activityItemList); |
|
|
|
//获取实际获得奖项 |
|
|
|
WxOfflineActivityGrantItem grantItemQ = new WxOfflineActivityGrantItem(); |
|
|
|
grantItemQ.updateTenantInfo(grantAward); |
|
|
|
grantItemQ.setGrantId(grantId); |
|
|
|
List<WxOfflineActivityGrantItem> grantItemList = wxOfflineActivityGrantItemMapper.findList(grantItemQ); |
|
|
|
Map<Long, List<WxOfflineActivityGrantItem>> activityItemGrantMap = grantItemList.stream().collect(groupingBy(WxOfflineActivityGrantItem::getActivityItemId)); |
|
|
|
for (WxOfflineActivityItem activityItem : grantAward.getActivityItemList()) { |
|
|
|
List<WxOfflineActivityGrantItem> grantActivityItemList = activityItemGrantMap.get(activityItem.getId()); |
|
|
|
if (grantActivityItemList == null || grantActivityItemList.isEmpty()) { |
|
|
|
activityItem.setIsMeet(false); |
|
|
|
continue; |
|
|
|
} |
|
|
|
for (WxOfflineActivityGrantItem grantItem : grantActivityItemList) { |
|
|
|
grantItem.setMallSharePrice(grantItem.getAwardPrice() |
|
|
|
.multiply(grantItem.getMallShareRate().divide(new BigDecimal(100))) |
|
|
|
.setScale(2, RoundingMode.HALF_UP)); |
|
|
|
grantItem.setMerchantSharePrice(grantItem.getAwardPrice().subtract(grantItem.getMallSharePrice())); |
|
|
|
WxOfflineActivityGrantAward grantAwardQ = new WxOfflineActivityGrantAward(); |
|
|
|
grantAwardQ.updateTenantInfo(wxOfflineActivityGrantAward); |
|
|
|
grantAwardQ.setIds(grantIds); |
|
|
|
List<WxOfflineActivityGrantAward> grantAwardList = wxOfflineActivityGrantAwardMapper.findList(grantAwardQ); |
|
|
|
for (WxOfflineActivityGrantAward grantAward : grantAwardList) { |
|
|
|
//获取奖项 |
|
|
|
List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(grantAward.getActivityId(), grantAward.getTenantId()); |
|
|
|
grantAward.setActivityItemList(activityItemList); |
|
|
|
//获取实际获得奖项 |
|
|
|
WxOfflineActivityGrantItem grantItemQ = new WxOfflineActivityGrantItem(); |
|
|
|
grantItemQ.updateTenantInfo(grantAward); |
|
|
|
grantItemQ.setGrantId(grantAward.getId()); |
|
|
|
List<WxOfflineActivityGrantItem> grantItemList = wxOfflineActivityGrantItemMapper.findList(grantItemQ); |
|
|
|
Map<Long, List<WxOfflineActivityGrantItem>> activityItemGrantMap = grantItemList.stream().collect(groupingBy(WxOfflineActivityGrantItem::getActivityItemId)); |
|
|
|
for (WxOfflineActivityItem activityItem : grantAward.getActivityItemList()) { |
|
|
|
List<WxOfflineActivityGrantItem> grantActivityItemList = activityItemGrantMap.get(activityItem.getId()); |
|
|
|
if (grantActivityItemList == null || grantActivityItemList.isEmpty()) { |
|
|
|
activityItem.setIsMeet(false); |
|
|
|
continue; |
|
|
|
} |
|
|
|
for (WxOfflineActivityGrantItem grantItem : grantActivityItemList) { |
|
|
|
grantItem.setMallSharePrice(grantItem.getAwardPrice() |
|
|
|
.multiply(grantItem.getMallShareRate().divide(new BigDecimal(100))) |
|
|
|
.setScale(2, RoundingMode.HALF_UP)); |
|
|
|
grantItem.setMerchantSharePrice(grantItem.getAwardPrice().subtract(grantItem.getMallSharePrice())); |
|
|
|
} |
|
|
|
activityItem.setIsMeet(true); |
|
|
|
activityItem.setActivityGrantItemList(grantActivityItemList); |
|
|
|
} |
|
|
|
activityItem.setIsMeet(true); |
|
|
|
activityItem.setActivityGrantItemList(grantActivityItemList); |
|
|
|
} |
|
|
|
return grantAward; |
|
|
|
|
|
|
|
return grantAwardList; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|