|
|
|
@@ -9,6 +9,7 @@ import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.vo.OfflineActivityGrantRecord; |
|
|
|
import com.iformall.domain.vo.OfflineActivityRecordStatistics; |
|
|
|
import com.iformall.enums.*; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
@@ -615,13 +616,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
grantItemQ.setActivityId(wxOfflineActivity.getId()); |
|
|
|
List<WxOfflineActivityGrantItem> grantItem = wxOfflineActivityGrantItemMapper.findList(grantItemQ); |
|
|
|
Map<Long, List<WxOfflineActivityGrantItem>> grantItemMap = grantItem.stream().collect(groupingBy(WxOfflineActivityGrantItem::getGrantId)); |
|
|
|
List<OfflineActivityGrantRecord> grantRecordList = wxOfflineActivityRecordGrantMapper.findGrantRecordList(wxOfflineActivity.getId(),wxOfflineActivity.getTenantId()); |
|
|
|
Map<Long, List<OfflineActivityGrantRecord>> grantRecordMap = grantRecordList.stream().collect(groupingBy(OfflineActivityGrantRecord::getGrantId)); |
|
|
|
for (WxOfflineActivityGrantAward grantAward : grantAwardList) { |
|
|
|
List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findGrantList(grantAward.getId(),grantAward.getTenantId()); |
|
|
|
// List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findGrantList(grantAward.getId(),grantAward.getTenantId()); |
|
|
|
List<WxOfflineActivityGrantItem> grantItemList = grantItemMap.get(grantAward.getId()); |
|
|
|
List<OfflineActivityGrantRecord> recordList = grantRecordMap.get(grantAward.getId()); |
|
|
|
Map<String,Object> activityGrantObject = new HashMap<>(); |
|
|
|
activityGrantObject.put("activityName",activity.getName()); |
|
|
|
List<String> merchantOrder = new ArrayList<>(); |
|
|
|
for (WxOfflineActivityRecord record : recordList) { |
|
|
|
List<String> merchantOrder = new ArrayList<>(); |
|
|
|
for (OfflineActivityGrantRecord record : recordList) { |
|
|
|
merchantOrder.add(record.getOrderNo()+"["+merchantMap.get(record.getMerchantId())+"]"); |
|
|
|
} |
|
|
|
activityGrantObject.put("merchantOrder", String.join(";", merchantOrder)); |
|
|
|
|