From fc555f5d9d49f9922a6f5688d4db7c2679f3252c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 七月 2025 18:53:47 +0800
Subject: [PATCH] 政务云数据上传bug修改
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java | 116 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 42 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
index 74da343..af942d8 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
@@ -299,6 +299,10 @@
log.info("用户优惠券"+appCoupons.size());
// 将id 设置为null
log.info("策略"+appCoupons.size());
+ appCoupons = appCoupons.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < appCoupons.size(); i += 700) {
appCouponService.saveOrUpdateBatch(appCoupons.subList(i, Math.min(i + 700, appCoupons.size())));
@@ -307,16 +311,23 @@
List<TAppUser> appUsers = data.getAppUsers();
if (!appUsers.isEmpty()) {
log.info("用户"+appUsers.size());
-
+ appUsers = appUsers.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < appUsers.size(); i += 700) {
appUserService.saveOrUpdateBatch(appUsers.subList(i, Math.min(i + 700, appUsers.size())));
}
+
}
List<TAppUserAddress> appUserAddresses = data.getAppUserAddresses();
if (!appUserAddresses.isEmpty()) {
log.info("用户地址"+appUserAddresses.size());
-
+ appUserAddresses = appUserAddresses.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < appUserAddresses.size(); i += 700) {
appUserAddressService.saveOrUpdateBatch(appUserAddresses.subList(i, Math.min(i + 700, appUserAddresses.size())));
@@ -325,7 +336,10 @@
List<TAppUserCar> appUserCars = data.getAppUserCars();
if (!appUserCars.isEmpty()) {
log.info("用户车辆"+appUserCars.size());
- appUserCarService.saveOrUpdateBatch(appUserCars);
+ appUserCars = appUserCars.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < appUserCars.size(); i += 700) {
appUserCarService.saveOrUpdateBatch(appUserCars.subList(i, Math.min(i + 700, appUserCars.size())));
@@ -334,7 +348,10 @@
List<TAppUserIntegralChange> appUserIntegralChanges = data.getAppUserIntegralChanges();
if (!appUserIntegralChanges.isEmpty()) {
log.info("用户积分变动"+appUserIntegralChanges.size());
-
+ appUserIntegralChanges = appUserIntegralChanges.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < appUserIntegralChanges.size(); i += 700) {
appUserIntegralChangeService.saveOrUpdateBatch(appUserIntegralChanges.subList(i, Math.min(i + 700, appUserIntegralChanges.size())));
@@ -343,7 +360,10 @@
List<TAppUserSign> appUserSigns = data.getAppUserSigns();
if (!appUserSigns.isEmpty()) {
log.info("用户签到"+appUserSigns.size());
-
+ appUserSigns = appUserSigns.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < appUserSigns.size(); i += 700) {
appUserSignService.saveOrUpdateBatch(appUserSigns.subList(i, Math.min(i + 700, appUserSigns.size())));
@@ -353,7 +373,10 @@
if (!appUserTags.isEmpty()) {
log.info("用户标签"+appUserTags.size());
-
+ appUserTags = appUserTags.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < appUserTags.size(); i += 700) {
appUserTagService.saveOrUpdateBatch(appUserTags.subList(i, Math.min(i + 700, appUserTags.size())));
@@ -363,7 +386,10 @@
if (!appUserVipDetails.isEmpty()) {
log.info("用户会员明细"+appUserVipDetails.size());
-
+ appUserVipDetails = appUserVipDetails.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < appUserVipDetails.size(); i += 700) {
appUserVipDetailService.saveOrUpdateBatch(appUserVipDetails.subList(i, Math.min(i + 700, appUserVipDetails.size())));
@@ -372,7 +398,10 @@
List<TInviteUser> inviteUsers = data.getInviteUsers();
if (!inviteUsers.isEmpty()) {
log.info("邀请用户"+inviteUsers.size());
-
+ inviteUsers = inviteUsers.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < inviteUsers.size(); i += 700) {
inviteUserService.saveOrUpdateBatch(inviteUsers.subList(i, Math.min(i + 700, inviteUsers.size())));
@@ -381,7 +410,10 @@
List<TInvoiceInformation> invoiceInformations = data.getInvoiceInformations();
if (!invoiceInformations.isEmpty()) {
log.info("开票"+invoiceInformations.size());
-
+ invoiceInformations = invoiceInformations.stream()
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
+ .collect(Collectors.toList());
// 分批插入数据 每次最多700条
for (int i = 0; i < invoiceInformations.size(); i += 700) {
tInvoiceInformationService.saveOrUpdateBatch(invoiceInformations.subList(i, Math.min(i + 700, invoiceInformations.size())));
@@ -416,7 +448,7 @@
log.info("策略"+accountingStrategies.size());
// 筛选出昨天凌晨00:00:00到昨天晚上23:59:59的数据
accountingStrategies = accountingStrategies.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -428,7 +460,7 @@
if (!accountingStrategyDetails.isEmpty()) {
log.info("策略明细"+accountingStrategyDetails.size());
accountingStrategyDetails = accountingStrategyDetails.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < accountingStrategies.size(); i += 700) {
@@ -439,7 +471,7 @@
if (!applyChargingPiles.isEmpty()) {
log.info("申请充电桩"+applyChargingPiles.size());
applyChargingPiles = applyChargingPiles.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -453,7 +485,7 @@
log.info("车库"+carports.size());
// 分批插入数据 每次最多700条
carports = carports.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < carports.size(); i += 700) {
@@ -465,7 +497,7 @@
log.info("充电枪"+chargingGuns.size());
// 分批插入数据 每次最多700条
chargingGuns = chargingGuns.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < chargingGuns.size(); i += 700) {
@@ -479,7 +511,7 @@
log.info("充电桩"+chargingPiles.size());
// 分批插入数据 每次最多700条
chargingPiles = chargingPiles.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < chargingPiles.size(); i += 700) {
@@ -492,7 +524,7 @@
log.info("充电桩通知"+chargingPileNotifications.size());
// 分批插入数据 每次最多700条
chargingPileNotifications = chargingPileNotifications.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < chargingPileNotifications.size(); i += 700) {
@@ -504,7 +536,7 @@
log.info("故障"+faultMessages.size());
// 分批插入数据 每次最多700条
faultMessages = faultMessages.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < faultMessages.size(); i += 700) {
@@ -516,7 +548,7 @@
log.info("监控设备"+monitoringEquipments.size());
// 分批插入数据 每次最多700条
monitoringEquipments = monitoringEquipments.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < monitoringEquipments.size(); i += 700) {
@@ -529,7 +561,7 @@
log.info("停车场"+parkingLots.size());
// 分批插入数据 每次最多700条
parkingLots = parkingLots.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < parkingLots.size(); i += 700) {
@@ -541,7 +573,7 @@
log.info("停车记录"+parkingRecords.size());
// 分批插入数据 每次最多700条
parkingRecords = parkingRecords.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < parkingRecords.size(); i += 700) {
@@ -562,7 +594,7 @@
log.info("报修"+repairs.size());
// 分批插入数据 每次最多700条
repairs = repairs.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < repairs.size(); i += 700) {
@@ -574,7 +606,7 @@
log.info("站点菜单"+repairs.size());
// 分批插入数据 每次最多700条
siteMenus = siteMenus.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < siteMenus.size(); i += 700) {
@@ -586,7 +618,7 @@
log.info("车道"+vehicleRamps.size());
// 分批插入数据 每次最多700条
vehicleRamps = vehicleRamps.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < vehicleRamps.size(); i += 700) {
@@ -621,7 +653,7 @@
log.info("订单明细策略" + accountingStrategyDetailOrders.size());
// 分批插入数据 每次最多700条
accountingStrategyDetailOrders = accountingStrategyDetailOrders.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < accountingStrategyDetailOrders.size(); i += 700) {
@@ -636,7 +668,7 @@
// 分批插入数据 每次最多700条
int size = 700;
accountingStrategyOrders = accountingStrategyOrders.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < accountingStrategyOrders.size(); i += size) {
@@ -652,7 +684,7 @@
// 分批插入数据 每次最多700条
// 分批插入数据 每次最多700条
chargingBills = chargingBills.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < chargingBills.size(); i += 700) {
@@ -667,7 +699,7 @@
log.info("充电订单策略" + chargingOrderAccountingStrategies.size());
// 分批插入数据 每次最多700条
chargingOrderAccountingStrategies = chargingOrderAccountingStrategies.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < chargingOrderAccountingStrategies.size(); i += 700) {
@@ -682,7 +714,7 @@
// 分批插入数据 每次最多700条
chargingOrderRefunds = chargingOrderRefunds.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < chargingOrderRefunds.size(); i += 700) {
@@ -696,7 +728,7 @@
log.info("充电订单" + chargingOrders.size());
// 分批插入数据 每次最多700条
chargingOrders = chargingOrders.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < chargingOrders.size(); i += 700) {
@@ -711,7 +743,7 @@
if (!exchangeOrders.isEmpty()) {
log.info("兑换订单" + exchangeOrders.size());
exchangeOrders = exchangeOrders.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -727,7 +759,7 @@
// 分批插入数据 每次最多700条
grantVips = grantVips.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < grantVips.size(); i += 700) {
@@ -740,7 +772,7 @@
if (!orderAppeals.isEmpty()) {
log.info("订单申诉" + orderAppeals.size());
orderAppeals = orderAppeals.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -754,7 +786,7 @@
if (!orderEvaluates.isEmpty()) {
log.info("订单评价"+orderEvaluates.size());
orderEvaluates = orderEvaluates.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -769,7 +801,7 @@
log.info("订单评价标签" + orderEvaluateTags.size());
// 分批插入数据 每次最多700条
orderEvaluateTags = orderEvaluateTags.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < orderEvaluateTags.size(); i += 700) {
@@ -783,7 +815,7 @@
log.info("订单开票明细" + orderInvoiceDetails.size());
// 分批插入数据 每次最多700条
orderInvoiceDetails = orderInvoiceDetails.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < orderInvoiceDetails.size(); i += 700) {
@@ -796,7 +828,7 @@
if (!orderInvoices.isEmpty()) {
log.info("订单开票" + orderInvoices.size());
orderInvoices = orderInvoices.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -811,7 +843,7 @@
if (!settlementConfirms.isEmpty()) {
log.info("账单结算" + settlementConfirms.size());
settlementConfirms = settlementConfirms.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -826,7 +858,7 @@
log.info("购物订单退款" + shoppingOrderRefunds.size());
// 分批插入数据 每次最多700条
shoppingOrderRefunds = shoppingOrderRefunds.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
for (int i = 0; i < shoppingOrderRefunds.size(); i += 700) {
@@ -839,7 +871,7 @@
if (!vipOrderRefunds.isEmpty()) {
log.info("会员订单退款" + vipOrderRefunds);
vipOrderRefunds = vipOrderRefunds.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -853,7 +885,7 @@
if (!vipOrders.isEmpty()) {
log.info("会员订单" + vipOrders.size());
vipOrders = vipOrders.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -867,7 +899,7 @@
if (!shoppingOrders.isEmpty()) {
log.info("购物订单" + shoppingOrders.size());
shoppingOrders = shoppingOrders.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
@@ -1006,7 +1038,7 @@
if (!loginLogs.isEmpty()) {
log.info("登录日志"+loginLogs.size());
loginLogs = loginLogs.stream()
- .filter(accountingStrategy -> accountingStrategy.getCreateTime().isAfter(startOfDay))
+ .filter(accountingStrategy -> accountingStrategy.getCreateTime()!=null&&accountingStrategy.getCreateTime().isAfter(startOfDay))
.filter(accountingStrategy -> accountingStrategy.getCreateTime().isBefore(endOfDay))
.collect(Collectors.toList());
// 分批插入数据 每次最多700条
--
Gitblit v1.7.1