fix："优化子账号设置管理机器功能"

src/main/java/com/szwl/controller/TOrderController.java

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

src/main/java/com/szwl/service/es/EsTOrderService.java

@@ -394,7 +394,6 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
             for (Histogram.Bucket bucket : buckets) {
                 ChartBean chartBean = new ChartBean();
                 chartBean.setCategorie(bucket.getKeyAsString());
-//                chartBean.setSaleNum(Float.valueOf(bucket.getDocCount()));
                 //统计商品数
                 ParsedSum saleNum1 = bucket.getAggregations().get(aggName_productNumber);
                 ParsedSum saleNum2 = bucket.getAggregations().get(aggName_refundQuantity);