|
@@ -713,8 +713,13 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
if (equipment == null) {
|
|
if (equipment == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(equipment.getAdminId())));
|
|
|
|
- if (admin == null) {
|
|
|
|
|
|
+// TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(equipment.getAdminId())));
|
|
|
|
+// if (admin == null) {
|
|
|
|
+// continue;
|
|
|
|
+// }
|
|
|
|
+ Long adminId = equipment.getAdminId();
|
|
|
|
+ String companyType = R.getDataIfSuccess(szwlFeign.getCompanyTypeById(String.valueOf(equipment.getAdminId())));
|
|
|
|
+ if (StringUtils.isEmpty(companyType)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
// 先查询是否已有数据
|
|
// 先查询是否已有数据
|
|
@@ -740,23 +745,27 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
}
|
|
}
|
|
// 没有的话就插入数据
|
|
// 没有的话就插入数据
|
|
orderStatistics.setSalePrice(new BigDecimal(priceTotal).setScale(2, RoundingMode.HALF_UP));
|
|
orderStatistics.setSalePrice(new BigDecimal(priceTotal).setScale(2, RoundingMode.HALF_UP));
|
|
- orderStatistics.setAdminId(admin.getId());
|
|
|
|
|
|
+ orderStatistics.setAdminId(adminId);
|
|
orderStatistics.setEquipmentId(equipment.getId());
|
|
orderStatistics.setEquipmentId(equipment.getId());
|
|
orderStatistics.setClientId(key);
|
|
orderStatistics.setClientId(key);
|
|
orderStatistics.setSaleNum(saleNum);
|
|
orderStatistics.setSaleNum(saleNum);
|
|
orderStatistics.setOrderNum(Long.valueOf(docCount).intValue());
|
|
orderStatistics.setOrderNum(Long.valueOf(docCount).intValue());
|
|
- orderStatistics.setCompanyType(admin.getCompanyType());
|
|
|
|
|
|
+ orderStatistics.setCompanyType(companyType);
|
|
orderStatistics.setStatisticsDate(statisticsDate);
|
|
orderStatistics.setStatisticsDate(statisticsDate);
|
|
insertYearList.add(orderStatistics);
|
|
insertYearList.add(orderStatistics);
|
|
} else {
|
|
} else {
|
|
// 按商户分组
|
|
// 按商户分组
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(key));
|
|
|
|
- if (admin == null) {
|
|
|
|
|
|
+// TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(key));
|
|
|
|
+// if (admin == null) {
|
|
|
|
+// continue;
|
|
|
|
+// }
|
|
|
|
+ String companyType = R.getDataIfSuccess(szwlFeign.getCompanyTypeById(key));
|
|
|
|
+ if (StringUtils.isEmpty(companyType)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
// 先查询是否已有数据
|
|
// 先查询是否已有数据
|
|
LambdaQueryWrapper<OrderStatisticsYear> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<OrderStatisticsYear> query = Wrappers.lambdaQuery();
|
|
- query.eq(OrderStatisticsYear::getAdminId, admin.getId());
|
|
|
|
|
|
+ query.eq(OrderStatisticsYear::getAdminId, key);
|
|
query.eq(OrderStatisticsYear::getStatisticsDate, statisticsDate);
|
|
query.eq(OrderStatisticsYear::getStatisticsDate, statisticsDate);
|
|
query.eq(OrderStatisticsYear::getType, param.getPacketType());
|
|
query.eq(OrderStatisticsYear::getType, param.getPacketType());
|
|
query.eq(OrderStatisticsYear::getIfForeign, param.getIfForeign());
|
|
query.eq(OrderStatisticsYear::getIfForeign, param.getIfForeign());
|
|
@@ -775,10 +784,10 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
orderStatistics.setSalePrice(new BigDecimal(priceTotal).setScale(2, RoundingMode.HALF_UP));
|
|
orderStatistics.setSalePrice(new BigDecimal(priceTotal).setScale(2, RoundingMode.HALF_UP));
|
|
- orderStatistics.setAdminId(admin.getId());
|
|
|
|
|
|
+ orderStatistics.setAdminId(Long.valueOf(key));
|
|
orderStatistics.setSaleNum(saleNum);
|
|
orderStatistics.setSaleNum(saleNum);
|
|
orderStatistics.setOrderNum(Long.valueOf(docCount).intValue());
|
|
orderStatistics.setOrderNum(Long.valueOf(docCount).intValue());
|
|
- orderStatistics.setCompanyType(admin.getCompanyType());
|
|
|
|
|
|
+ orderStatistics.setCompanyType(companyType);
|
|
orderStatistics.setStatisticsDate(statisticsDate);
|
|
orderStatistics.setStatisticsDate(statisticsDate);
|
|
insertYearList.add(orderStatistics);
|
|
insertYearList.add(orderStatistics);
|
|
|
|
|
|
@@ -793,8 +802,13 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
if (equipment == null) {
|
|
if (equipment == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(equipment.getAdminId())));
|
|
|
|
- if (admin == null) {
|
|
|
|
|
|
+// TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(equipment.getAdminId())));
|
|
|
|
+// if (admin == null) {
|
|
|
|
+// continue;
|
|
|
|
+// }
|
|
|
|
+ Long adminId = equipment.getAdminId();
|
|
|
|
+ String companyType = R.getDataIfSuccess(szwlFeign.getCompanyTypeById(String.valueOf(adminId)));
|
|
|
|
+ if (StringUtils.isEmpty(companyType)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
// 先查询是否已有数据
|
|
// 先查询是否已有数据
|
|
@@ -820,23 +834,27 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
}
|
|
}
|
|
|
|
|
|
orderStatistics.setSalePrice(new BigDecimal(priceTotal).setScale(2, RoundingMode.HALF_UP));
|
|
orderStatistics.setSalePrice(new BigDecimal(priceTotal).setScale(2, RoundingMode.HALF_UP));
|
|
- orderStatistics.setAdminId(admin.getId());
|
|
|
|
|
|
+ orderStatistics.setAdminId(adminId);
|
|
orderStatistics.setEquipmentId(equipment.getId());
|
|
orderStatistics.setEquipmentId(equipment.getId());
|
|
orderStatistics.setClientId(key);
|
|
orderStatistics.setClientId(key);
|
|
orderStatistics.setSaleNum(saleNum);
|
|
orderStatistics.setSaleNum(saleNum);
|
|
orderStatistics.setOrderNum(Long.valueOf(docCount).intValue());
|
|
orderStatistics.setOrderNum(Long.valueOf(docCount).intValue());
|
|
- orderStatistics.setCompanyType(admin.getCompanyType());
|
|
|
|
|
|
+ orderStatistics.setCompanyType(companyType);
|
|
orderStatistics.setStatisticsDate(statisticsDate);
|
|
orderStatistics.setStatisticsDate(statisticsDate);
|
|
insertMonthList.add(orderStatistics);
|
|
insertMonthList.add(orderStatistics);
|
|
} else {
|
|
} else {
|
|
// 按商户分组
|
|
// 按商户分组
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(key));
|
|
|
|
- if (admin == null) {
|
|
|
|
|
|
+// TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(key));
|
|
|
|
+// if (admin == null) {
|
|
|
|
+// continue;
|
|
|
|
+// }
|
|
|
|
+ String companyType = R.getDataIfSuccess(szwlFeign.getCompanyTypeById(key));
|
|
|
|
+ if (StringUtils.isEmpty(companyType)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
// 先查询是否已有数据
|
|
// 先查询是否已有数据
|
|
LambdaQueryWrapper<OrderStatisticsMonth> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<OrderStatisticsMonth> query = Wrappers.lambdaQuery();
|
|
- query.eq(OrderStatisticsMonth::getAdminId, admin.getId());
|
|
|
|
|
|
+ query.eq(OrderStatisticsMonth::getAdminId, key);
|
|
query.eq(OrderStatisticsMonth::getStatisticsDate, statisticsDate);
|
|
query.eq(OrderStatisticsMonth::getStatisticsDate, statisticsDate);
|
|
query.eq(OrderStatisticsMonth::getType, param.getPacketType());
|
|
query.eq(OrderStatisticsMonth::getType, param.getPacketType());
|
|
query.eq(OrderStatisticsMonth::getIfForeign, param.getIfForeign());
|
|
query.eq(OrderStatisticsMonth::getIfForeign, param.getIfForeign());
|
|
@@ -855,10 +873,10 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
orderStatistics.setSalePrice(new BigDecimal(priceTotal).setScale(2, RoundingMode.HALF_UP));
|
|
orderStatistics.setSalePrice(new BigDecimal(priceTotal).setScale(2, RoundingMode.HALF_UP));
|
|
- orderStatistics.setAdminId(admin.getId());
|
|
|
|
|
|
+ orderStatistics.setAdminId(Long.valueOf(key));
|
|
orderStatistics.setSaleNum(saleNum);
|
|
orderStatistics.setSaleNum(saleNum);
|
|
orderStatistics.setOrderNum(Long.valueOf(docCount).intValue());
|
|
orderStatistics.setOrderNum(Long.valueOf(docCount).intValue());
|
|
- orderStatistics.setCompanyType(admin.getCompanyType());
|
|
|
|
|
|
+ orderStatistics.setCompanyType(companyType);
|
|
orderStatistics.setStatisticsDate(statisticsDate);
|
|
orderStatistics.setStatisticsDate(statisticsDate);
|
|
insertMonthList.add(orderStatistics);
|
|
insertMonthList.add(orderStatistics);
|
|
}
|
|
}
|