| @@ -6,10 +6,7 @@ import com.iformall.mapper.WxVtwoActivityGrantOrderMapper; | |||||
| import com.iformall.mapper.WxVtwoActivityGrantSettlementMapper; | import com.iformall.mapper.WxVtwoActivityGrantSettlementMapper; | ||||
| import com.iformall.mapper.WxVtwoCashBackGrantAwardMapper; | import com.iformall.mapper.WxVtwoCashBackGrantAwardMapper; | ||||
| import com.iformall.mapper.WxVtwoCashBackGrantMapper; | import com.iformall.mapper.WxVtwoCashBackGrantMapper; | ||||
| import com.iformall.service.WxVtwoActivityGrantExportTwoService; | |||||
| import com.iformall.service.WxVtwoActivityGrantSettlementService; | |||||
| import com.iformall.service.WxVtwoActivityOrderService; | |||||
| import com.iformall.service.WxVtwoCashBackGrantService; | |||||
| import com.iformall.service.*; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -17,7 +14,9 @@ import org.springframework.scheduling.annotation.Async; | |||||
| import org.springframework.scheduling.annotation.Scheduled; | import org.springframework.scheduling.annotation.Scheduled; | ||||
| import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
| import java.util.HashMap; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | |||||
| import java.util.stream.Collectors; | import java.util.stream.Collectors; | ||||
| @Component | @Component | ||||
| @@ -43,7 +42,8 @@ public class WxVtwoActivityGrantExportTwoSchedule { | |||||
| @Autowired | @Autowired | ||||
| private WxVtwoActivityGrantExportTwoService wxVtwoActivityGrantExportTwoService; | private WxVtwoActivityGrantExportTwoService wxVtwoActivityGrantExportTwoService; | ||||
| @Autowired | |||||
| private MallUserInfoService mallUserInfoService; | |||||
| @Async | @Async | ||||
| @Scheduled(cron = "0 */30 * * * ?") // 每小时检查一次 | @Scheduled(cron = "0 */30 * * * ?") // 每小时检查一次 | ||||
| @@ -53,27 +53,38 @@ public class WxVtwoActivityGrantExportTwoSchedule { | |||||
| String tenantId = "1095"; | String tenantId = "1095"; | ||||
| List<WxVtwoCashBackGrant> todoList = wxVtwoCashBackGrantMapper.findTodoList(tenantId); | List<WxVtwoCashBackGrant> todoList = wxVtwoCashBackGrantMapper.findTodoList(tenantId); | ||||
| if(todoList != null && !todoList.isEmpty()) { | if(todoList != null && !todoList.isEmpty()) { | ||||
| MallUserInfo userInfoQ = new MallUserInfo(); | |||||
| userInfoQ.setTenantId(tenantId); | |||||
| Map<Long,MallUserInfo> userMap = mallUserInfoService.getUserMap(userInfoQ); | |||||
| todoList.forEach(todo ->{ | todoList.forEach(todo ->{ | ||||
| WxVtwoActivityGrantOrder grantOrderQ = new WxVtwoActivityGrantOrder(); | |||||
| grantOrderQ.updateTenantInfo(todo); | |||||
| grantOrderQ.setGrantId(todo.getId()); | |||||
| List<WxVtwoActivityGrantOrder> grantOrderList = wxVtwoActivityGrantOrderMapper.findList(grantOrderQ); | |||||
| List<Long> orderIds = grantOrderList.stream().map(WxVtwoActivityGrantOrder::getOrderId).collect(Collectors.toList()); | |||||
| List<Long> filterIdList = grantOrderList.stream().filter(grantOrder -> grantOrder.getIsAmount().equals(EnumYesOrNo.YES.getCode())).map(WxVtwoActivityGrantOrder::getOrderId).collect(Collectors.toList()); | |||||
| List<WxVtwoActivityOrder> grantOrder = wxVtwoActivityOrderService.findGrantOrder(todo, orderIds, filterIdList); | |||||
| todo.setOrderList(grantOrder); | |||||
| WxVtwoCashBackGrantAward grantAwardQ = new WxVtwoCashBackGrantAward(); | |||||
| grantAwardQ.updateTenantInfo(todo); | |||||
| grantAwardQ.setGrantId(todo.getId()); | |||||
| List<WxVtwoCashBackGrantAward> grantAwardList = wxVtwoCashBackGrantAwardMapper.findList(grantAwardQ); | |||||
| todo.setGrantAwardList(grantAwardList); | |||||
| WxVtwoActivityGrantSettlement grantSettlementQ = new WxVtwoActivityGrantSettlement(); | |||||
| grantSettlementQ.updateTenantInfo(todo); | |||||
| grantSettlementQ.setGrantId(todo.getId()); | |||||
| List<WxVtwoActivityGrantSettlement> grantSettlementList = wxVtwoActivityGrantSettlementMapper.findList(grantSettlementQ); | |||||
| wxVtwoActivityGrantExportTwoService.saveGrantExport(todo,grantSettlementList); | |||||
| try{ | |||||
| if(todo.getCreateBy() != null){ | |||||
| todo.setCreateByName(userMap.get(todo.getCreateBy()).getName()); | |||||
| } | |||||
| WxVtwoActivityGrantOrder grantOrderQ = new WxVtwoActivityGrantOrder(); | |||||
| grantOrderQ.updateTenantInfo(todo); | |||||
| grantOrderQ.setGrantId(todo.getId()); | |||||
| List<WxVtwoActivityGrantOrder> grantOrderList = wxVtwoActivityGrantOrderMapper.findList(grantOrderQ); | |||||
| List<Long> orderIds = grantOrderList.stream().map(WxVtwoActivityGrantOrder::getOrderId).collect(Collectors.toList()); | |||||
| List<Long> filterIdList = grantOrderList.stream().filter(grantOrder -> grantOrder.getIsAmount().equals(EnumYesOrNo.YES.getCode())).map(WxVtwoActivityGrantOrder::getOrderId).collect(Collectors.toList()); | |||||
| List<WxVtwoActivityOrder> grantOrder = wxVtwoActivityOrderService.findGrantOrder(todo, orderIds, filterIdList); | |||||
| todo.setOrderList(grantOrder); | |||||
| WxVtwoCashBackGrantAward grantAwardQ = new WxVtwoCashBackGrantAward(); | |||||
| grantAwardQ.updateTenantInfo(todo); | |||||
| grantAwardQ.setGrantId(todo.getId()); | |||||
| List<WxVtwoCashBackGrantAward> grantAwardList = wxVtwoCashBackGrantAwardMapper.findList(grantAwardQ); | |||||
| todo.setGrantAwardList(grantAwardList); | |||||
| WxVtwoActivityGrantSettlement grantSettlementQ = new WxVtwoActivityGrantSettlement(); | |||||
| grantSettlementQ.updateTenantInfo(todo); | |||||
| grantSettlementQ.setGrantId(todo.getId()); | |||||
| List<WxVtwoActivityGrantSettlement> grantSettlementList = wxVtwoActivityGrantSettlementMapper.findList(grantSettlementQ); | |||||
| wxVtwoActivityGrantExportTwoService.saveGrantExport(todo,grantSettlementList); | |||||
| }catch(Exception ignored){} | |||||
| }); | }); | ||||
| } | } | ||||
| } | } | ||||