|
@@ -716,8 +716,6 @@ public class TOrderController {
|
|
TAdminEquipment adminEquipment = R.getDataIfSuccess(szwlFeign.getClientIdList(String.valueOf(admin.getId())));
|
|
TAdminEquipment adminEquipment = R.getDataIfSuccess(szwlFeign.getClientIdList(String.valueOf(admin.getId())));
|
|
// 如果是全部机器
|
|
// 如果是全部机器
|
|
if (!adminEquipment.getType().equals("0")) {
|
|
if (!adminEquipment.getType().equals("0")) {
|
|
-// param.setAdminId(admin.getParentId().toString());
|
|
|
|
-// } else {
|
|
|
|
// 查找属于这个商家子账户的设备
|
|
// 查找属于这个商家子账户的设备
|
|
List<String> list = R.getDataIfSuccess(szwlFeign.getClientIds(adminId));
|
|
List<String> list = R.getDataIfSuccess(szwlFeign.getClientIds(adminId));
|
|
param.setClientIds(list);
|
|
param.setClientIds(list);
|
|
@@ -728,11 +726,10 @@ public class TOrderController {
|
|
return ResponseEntity
|
|
return ResponseEntity
|
|
.status(HttpStatus.OK)
|
|
.status(HttpStatus.OK)
|
|
.body(new ResultMessage()
|
|
.body(new ResultMessage()
|
|
- .setCode(false)
|
|
|
|
|
|
+ .setCode(true)
|
|
.setData(null)
|
|
.setData(null)
|
|
- .setMessage("没有绑定机器/no machine"));
|
|
|
|
|
|
+ .setMessage(""));
|
|
}
|
|
}
|
|
-// param.setAdminId(null);
|
|
|
|
}
|
|
}
|
|
param.setAdminId(String.valueOf(admin.getParentId()));
|
|
param.setAdminId(String.valueOf(admin.getParentId()));
|
|
}
|
|
}
|
|
@@ -796,12 +793,9 @@ public class TOrderController {
|
|
chartColumn = esTOrderService.getStatistics(param);
|
|
chartColumn = esTOrderService.getStatistics(param);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
log.error("使用es 查询发生错误:{}", e);
|
|
log.error("使用es 查询发生错误:{}", e);
|
|
- // 查 mysql
|
|
|
|
-// chartColumn = tOrderService.getStatistics(param);
|
|
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
// 查 mysql
|
|
// 查 mysql
|
|
-// chartColumn = tOrderService.getStatistics(param);
|
|
|
|
chartColumn = orderService.getStatistics(param);
|
|
chartColumn = orderService.getStatistics(param);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1013,7 +1007,7 @@ public class TOrderController {
|
|
List<String> strings = Arrays.asList(adminEquipment.getEquipmentIds().split(","));
|
|
List<String> strings = Arrays.asList(adminEquipment.getEquipmentIds().split(","));
|
|
param.setEquipmentIds(strings);
|
|
param.setEquipmentIds(strings);
|
|
} else {
|
|
} else {
|
|
- return R.fail(ResponseCodesEnum.A0001, "没有绑定机器/no machine");
|
|
|
|
|
|
+ return R.ok();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
param.setAdminId(String.valueOf(admin.getParentId()));
|
|
param.setAdminId(String.valueOf(admin.getParentId()));
|