|
@@ -713,7 +713,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
if (equipment == null) {
|
|
if (equipment == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminVo(String.valueOf(equipment.getAdminId())));
|
|
|
|
|
|
+ TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(equipment.getAdminId())));
|
|
if (admin == null) {
|
|
if (admin == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -750,7 +750,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
insertYearList.add(orderStatistics);
|
|
insertYearList.add(orderStatistics);
|
|
} else {
|
|
} else {
|
|
// 按商户分组
|
|
// 按商户分组
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminVo(key));
|
|
|
|
|
|
+ TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(key));
|
|
if (admin == null) {
|
|
if (admin == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -793,7 +793,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
if (equipment == null) {
|
|
if (equipment == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminVo(String.valueOf(equipment.getAdminId())));
|
|
|
|
|
|
+ TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(equipment.getAdminId())));
|
|
if (admin == null) {
|
|
if (admin == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -830,7 +830,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
insertMonthList.add(orderStatistics);
|
|
insertMonthList.add(orderStatistics);
|
|
} else {
|
|
} else {
|
|
// 按商户分组
|
|
// 按商户分组
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminVo(key));
|
|
|
|
|
|
+ TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(key));
|
|
if (admin == null) {
|
|
if (admin == null) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|