From 4594b169d67a822af5659c7cf39c453f988539de Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Mon, 4 Aug 2025 22:46:11 +0800 Subject: [PATCH] //activity v. --- .../WxVtwoActivityGrantExportTwoSchedule.java | 62 +++++++++++++++++-- .../WxVtwoActivityGrantAwardMapper.java | 1 + .../mapper/WxVtwoActivityGrantMapper.java | 3 + .../mapper/WxVtwoActivityGrantMapper.xml | 7 +++ .../mapper/WxVtwoCashBackGrantMapper.xml | 2 +- 5 files changed, 68 insertions(+), 7 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxVtwoActivityGrantExportTwoSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxVtwoActivityGrantExportTwoSchedule.java index c5af8559e..22265b057 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxVtwoActivityGrantExportTwoSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxVtwoActivityGrantExportTwoSchedule.java @@ -2,10 +2,7 @@ package com.iformall.schedule; import com.iformall.domain.po.*; import com.iformall.enums.EnumYesOrNo; -import com.iformall.mapper.WxVtwoActivityGrantOrderMapper; -import com.iformall.mapper.WxVtwoActivityGrantSettlementMapper; -import com.iformall.mapper.WxVtwoCashBackGrantAwardMapper; -import com.iformall.mapper.WxVtwoCashBackGrantMapper; +import com.iformall.mapper.*; import com.iformall.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,6 +24,9 @@ public class WxVtwoActivityGrantExportTwoSchedule { @Autowired private WxVtwoCashBackGrantMapper wxVtwoCashBackGrantMapper; + @Autowired + private WxVtwoActivityGrantMapper wxVtwoActivityGrantMapper; + @Autowired private WxVtwoActivityGrantSettlementMapper wxVtwoActivityGrantSettlementMapper; @@ -39,6 +39,9 @@ public class WxVtwoActivityGrantExportTwoSchedule { @Autowired private WxVtwoCashBackGrantAwardMapper wxVtwoCashBackGrantAwardMapper; + @Autowired + private WxVtwoActivityGrantAwardMapper wxVtwoActivityGrantAwardMapper; + @Autowired private WxVtwoActivityGrantExportTwoService wxVtwoActivityGrantExportTwoService; @@ -49,8 +52,8 @@ public class WxVtwoActivityGrantExportTwoSchedule { @Scheduled(cron = "0 */30 * * * ?") // 每小时检查一次 public void wxVtwoCashBackGrantSchedule() { logger.info("*************************************************************************************"); -// String tenantId = "789"; - String tenantId = "1095"; + String tenantId = "789"; +// String tenantId = "1095"; List todoList = wxVtwoCashBackGrantMapper.findTodoList(tenantId); if(todoList != null && !todoList.isEmpty()) { @@ -82,6 +85,53 @@ public class WxVtwoActivityGrantExportTwoSchedule { grantSettlementQ.updateTenantInfo(todo); grantSettlementQ.setGrantId(todo.getId()); List grantSettlementList = wxVtwoActivityGrantSettlementMapper.findList(grantSettlementQ); + + wxVtwoActivityGrantExportTwoService.saveGrantExport(todo,grantSettlementList); + }catch(Exception ignored){} + + }); + } + } + + + @Async + @Scheduled(cron = "0 */30 * * * ?") // 每小时检查一次 + public void wxVtwoActivityGrantSchedule() { + logger.info("*************************************************************************************"); + String tenantId = "789"; +// String tenantId = "1095"; + List todoList = wxVtwoActivityGrantMapper.findTodoList(tenantId); + if(todoList != null && !todoList.isEmpty()) { + + MallUserInfo userInfoQ = new MallUserInfo(); + userInfoQ.setTenantId(tenantId); + Map userMap = mallUserInfoService.getUserMap(userInfoQ); + todoList.forEach(todo ->{ + try{ + if(todo.getCreateBy() != null){ + todo.setCreateByName(userMap.get(todo.getCreateBy()).getName()); + } + + WxVtwoActivityGrantOrder grantOrderQ = new WxVtwoActivityGrantOrder(); + grantOrderQ.updateTenantInfo(todo); + grantOrderQ.setGrantId(todo.getId()); + List grantOrderList = wxVtwoActivityGrantOrderMapper.findList(grantOrderQ); + List orderIds = grantOrderList.stream().map(WxVtwoActivityGrantOrder::getOrderId).collect(Collectors.toList()); + List filterIdList = grantOrderList.stream().filter(grantOrder -> grantOrder.getIsAmount().equals(EnumYesOrNo.YES.getCode())).map(WxVtwoActivityGrantOrder::getOrderId).collect(Collectors.toList()); + List grantOrder = wxVtwoActivityOrderService.findGrantOrder(todo, orderIds, filterIdList); + todo.setOrderList(grantOrder); + + WxVtwoActivityGrantAward grantAwardQ = new WxVtwoActivityGrantAward(); + grantAwardQ.updateTenantInfo(todo); + grantAwardQ.setGrantId(todo.getId()); + List grantAwardList = wxVtwoActivityGrantAwardMapper.findList(grantAwardQ); + todo.setGrantAwardList(grantAwardList); + + WxVtwoActivityGrantSettlement grantSettlementQ = new WxVtwoActivityGrantSettlement(); + grantSettlementQ.updateTenantInfo(todo); + grantSettlementQ.setGrantId(todo.getId()); + List grantSettlementList = wxVtwoActivityGrantSettlementMapper.findList(grantSettlementQ); + wxVtwoActivityGrantExportTwoService.saveGrantExport(todo,grantSettlementList); }catch(Exception ignored){} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantAwardMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantAwardMapper.java index 817c09d13..a5c8757c8 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantAwardMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantAwardMapper.java @@ -25,6 +25,7 @@ public interface WxVtwoActivityGrantAwardMapper extends CommonMapper awardItemStatistics(WxVtwoActivityGrantAward grantAward); + List findList(WxVtwoActivityGrantAward grantAward); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantMapper.java index 35114dc1d..09e4d8262 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxVtwoActivityGrant; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.iformall.domain.vo.WxVtwoAwardStatistics; +import io.lettuce.core.dynamic.annotation.Param; import java.util.List; @@ -18,6 +19,8 @@ public interface WxVtwoActivityGrantMapper extends CommonMapper activityAwardStatisticsChart(WxVtwoActivityGrant activityGrant); + + List findTodoList(@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantMapper.xml b/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantMapper.xml index 7bda33d3e..ec1b20dc1 100644 --- a/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantMapper.xml @@ -111,4 +111,11 @@ group by xTime + + diff --git a/mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantMapper.xml b/mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantMapper.xml index 64bd10c76..6f9ff5232 100644 --- a/mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantMapper.xml @@ -119,6 +119,6 @@ select from wx_vtwo_cash_back_grant where tenant_id=#{tenantId} and id not in (select id from wx_vtwo_activity_grant_export_two) - limit 100 + limit 111