|
@@ -191,8 +191,8 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
if(StringUtils.equals("0",param.getIfForeign())){ // 国内用户
|
|
if(StringUtils.equals("0",param.getIfForeign())){ // 国内用户
|
|
TOrderParam tOrderParam = new TOrderParam();
|
|
TOrderParam tOrderParam = new TOrderParam();
|
|
tOrderParam.setStatus(1);
|
|
tOrderParam.setStatus(1);
|
|
- tOrderParam.setCreateDate_start(start);
|
|
|
|
- tOrderParam.setCreateDate_end(end);
|
|
|
|
|
|
+ tOrderParam.setPayDate_start(start);
|
|
|
|
+ tOrderParam.setPayDate_end(end);
|
|
if(StringUtils.isNotEmpty(param.getAdminId())){ // 所属商家id
|
|
if(StringUtils.isNotEmpty(param.getAdminId())){ // 所属商家id
|
|
tOrderParam.setAdminId(Long.parseLong(param.getAdminId()));
|
|
tOrderParam.setAdminId(Long.parseLong(param.getAdminId()));
|
|
}
|
|
}
|
|
@@ -223,8 +223,8 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
}else{ // 国外用户
|
|
}else{ // 国外用户
|
|
TEquipmentParam tEquipmentParam = new TEquipmentParam();
|
|
TEquipmentParam tEquipmentParam = new TEquipmentParam();
|
|
TCoinOrderParam tCoinOrderParam = new TCoinOrderParam();
|
|
TCoinOrderParam tCoinOrderParam = new TCoinOrderParam();
|
|
- tCoinOrderParam.setCreateDate_start(start);
|
|
|
|
- tCoinOrderParam.setCreateDate_end(end);
|
|
|
|
|
|
+ tCoinOrderParam.setPayDate_start(start);
|
|
|
|
+ tCoinOrderParam.setPayDate_end(end);
|
|
// 设备id
|
|
// 设备id
|
|
if(StringUtils.isNotEmpty(param.getClientId())){
|
|
if(StringUtils.isNotEmpty(param.getClientId())){
|
|
// tEquipmentParam.setId(Long.parseLong(param.getEquipmentId()));
|
|
// tEquipmentParam.setId(Long.parseLong(param.getEquipmentId()));
|
|
@@ -348,7 +348,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
|
|
|
|
|
|
// 时间聚合
|
|
// 时间聚合
|
|
AggregationBuilder dateHistogram = AggregationBuilders.dateHistogram(aggregationResultName)
|
|
AggregationBuilder dateHistogram = AggregationBuilders.dateHistogram(aggregationResultName)
|
|
- .field("createDate")
|
|
|
|
|
|
+ .field("payDate")
|
|
.calendarInterval(interval)
|
|
.calendarInterval(interval)
|
|
.format(format);
|
|
.format(format);
|
|
|
|
|