From 8887d54a35e9de1b56ffdd0b6fb4694edb723e26 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 21 Oct 2025 17:07:51 +0800 Subject: [PATCH] fix --- .../com/iformall/domain/po/WxVtwoActivityGrantExportTwo.java | 5 +++++ .../service/WxVtwoActivityGrantExportTwoService.java | 2 +- .../impl/WxVtwoActivityGrantExportTwoServiceImpl.java | 4 +++- .../service/impl/WxVtwoPrizeDrawActivityServiceImpl.java | 2 +- .../resources/mapper/WxVtwoActivityGrantExportTwoMapper.xml | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantExportTwo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantExportTwo.java index e2e21e548..d2c915f94 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantExportTwo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrantExportTwo.java @@ -194,4 +194,9 @@ public class WxVtwoActivityGrantExportTwo extends TenantEntity { */ @TableField(value = "tax_amount") private BigDecimal taxAmount; + + @TableField(exist = false) + private Integer begin; + @TableField(exist = false) + private Integer limit; } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/WxVtwoActivityGrantExportTwoService.java b/mallinkService/src/main/java/com/iformall/service/WxVtwoActivityGrantExportTwoService.java index 75584d50f..48090034f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxVtwoActivityGrantExportTwoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxVtwoActivityGrantExportTwoService.java @@ -25,7 +25,7 @@ public interface WxVtwoActivityGrantExportTwoService extends IService findActivityGrantList(Long activityId, String tenantId); - List findActivityGrantExportList(Long activityId, String tenantId); + List findActivityGrantExportList(Long activityId, String tenantId,Integer begin,Integer limit); Integer selectMaxOrderGrantCount(Long activityId, String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java index e86bf07d6..79fb4ff4d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java @@ -253,10 +253,12 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl findActivityGrantExportList(Long activityId, String tenantId) { + public List findActivityGrantExportList(Long activityId, String tenantId,Integer begin,Integer limit) { WxVtwoActivityGrantExportTwo exportQ = new WxVtwoActivityGrantExportTwo(); exportQ.setTenantId(tenantId); exportQ.setActivityId(activityId); + exportQ.setBegin(begin); + exportQ.setLimit(limit); List exportList = wxVtwoActivityGrantExportTwoMapper.findList(exportQ); List retList = null; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java index 8b01de2ed..0ff41c97a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java @@ -633,7 +633,7 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl activityGrantExportList = wxVtwoActivityGrantExportTwoService.findActivityGrantExportList(activityGrant.getActivityId(),activityGrant.getTenantId()); + List activityGrantExportList = wxVtwoActivityGrantExportTwoService.findActivityGrantExportList(activityGrant.getActivityId(),activityGrant.getTenantId(),activityGrant.getBegin(),activityGrant.getLimit()); if(activityGrantExportList != null && !activityGrantExportList.isEmpty()){ for (int k = 0 ; k < activityGrantExportList.size(); k++) { WxVtwoActivityPrizeDrawMainData aget = activityGrantExportList.get(k); diff --git a/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantExportTwoMapper.xml b/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantExportTwoMapper.xml index 7ef702902..50fe5fec6 100644 --- a/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantExportTwoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantExportTwoMapper.xml @@ -81,6 +81,9 @@