diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivityGrantRecord.java b/mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivityGrantRecord.java new file mode 100644 index 000000000..d31b06996 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivityGrantRecord.java @@ -0,0 +1,17 @@ +package com.iformall.domain.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class OfflineActivityGrantRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long grantId; + private Long recordId; + private String orderNo; + private Long merchantId; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityRecordGrantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityRecordGrantMapper.java index a8e01052f..45daa3970 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityRecordGrantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityRecordGrantMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxOfflineActivityRecordGrant; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.iformall.domain.vo.OfflineActivityGrantRecord; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +21,8 @@ public interface WxOfflineActivityRecordGrantMapper extends CommonMapper recordGrantList); List selectGrantId(@Param("tenantId")String tenantId, @Param("activityId")Long activityId, @Param("recordId")Long recordId); + + List findGrantRecordList(@Param("activityId")Long activityId, @Param("tenantId")String tenantId); } 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 0604b9523..df8f3d9fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -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 grantItem = wxOfflineActivityGrantItemMapper.findList(grantItemQ); Map> grantItemMap = grantItem.stream().collect(groupingBy(WxOfflineActivityGrantItem::getGrantId)); + List grantRecordList = wxOfflineActivityRecordGrantMapper.findGrantRecordList(wxOfflineActivity.getId(),wxOfflineActivity.getTenantId()); + Map> grantRecordMap = grantRecordList.stream().collect(groupingBy(OfflineActivityGrantRecord::getGrantId)); for (WxOfflineActivityGrantAward grantAward : grantAwardList) { - List recordList = wxOfflineActivityRecordMapper.findGrantList(grantAward.getId(),grantAward.getTenantId()); +// List recordList = wxOfflineActivityRecordMapper.findGrantList(grantAward.getId(),grantAward.getTenantId()); List grantItemList = grantItemMap.get(grantAward.getId()); + List recordList = grantRecordMap.get(grantAward.getId()); Map activityGrantObject = new HashMap<>(); activityGrantObject.put("activityName",activity.getName()); - List merchantOrder = new ArrayList<>(); - for (WxOfflineActivityRecord record : recordList) { + List merchantOrder = new ArrayList<>(); + for (OfflineActivityGrantRecord record : recordList) { merchantOrder.add(record.getOrderNo()+"["+merchantMap.get(record.getMerchantId())+"]"); } activityGrantObject.put("merchantOrder", String.join(";", merchantOrder)); diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml index 20a3c9a5c..b84ca5716 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml @@ -38,4 +38,14 @@ where activity_id = #{activityId} and record_id = #{recordId} and tenant_id=#{tenantId} + + diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml index 85b1aca7b..4d8a93076 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml @@ -236,7 +236,7 @@ r.cus_card,r.lottery_num,r.lottery_count, r.anniversary_lottery_num,r.create_by,r.merchant_id,r.business_id, r.create_date,r.update_date,r.audit_remark, - r.audit_status,r.audit_by,audit_time + r.audit_status,r.audit_by,r.audit_time from wx_offline_activity_record_grant rg left join wx_offline_activity_record r on rg.record_id = r.id where rg.grant_id = #{grantId} and rg.tenant_id=#{tenantId}