r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
wwb 2026-03-16 16:44:57 +08:00
parent df44f8e6c0
commit 2084896e40
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -816,17 +816,49 @@ public class SaleOrderServiceImpl implements SaleOrderService {
@Override
public List<DataComparisonRespVO<TradeOrderTrendRespVO>> getOrderCountTrendComparison(TradeOrderTrendReqVO reqVO) {
// 查询当前数据
List<TradeOrderTrendRespVO> value = getOrderCountTrend(reqVO.getType(), reqVO.getBeginTime(), reqVO.getEndTime());
if(reqVO.getType() == 1){//30日
reqVO.setBeginTime(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(),-30)).toLocalDateTime());
reqVO.setEndTime(DateUtil.endOfDay(new Date()).toLocalDateTime());
}else if(reqVO.getType() == 7){//周
reqVO.setBeginTime(DateUtil.beginOfWeek(new Date()).toLocalDateTime());
reqVO.setEndTime(DateUtil.endOfWeek(new Date()).toLocalDateTime());
}else if(reqVO.getType() == 30){//月
reqVO.setBeginTime(DateUtil.beginOfMonth(new Date()).toLocalDateTime());
reqVO.setEndTime(DateUtil.endOfMonth(new Date()).toLocalDateTime());
}else if(reqVO.getType() == 365){//年
reqVO.setBeginTime(DateUtil.beginOfYear(new Date()).toLocalDateTime());
reqVO.setEndTime(DateUtil.endOfYear(new Date()).toLocalDateTime());
}
List<TradeOrderTrendRespVO> value = getOrderCountTrend(reqVO.getType(),reqVO.getBeginTime() , reqVO.getEndTime());
// 查询对照数据
LocalDateTime referenceEndTime = reqVO.getBeginTime().minusDays(1);
LocalDateTime referenceBeginTime = referenceEndTime.minus(Duration.between(reqVO.getBeginTime(), reqVO.getEndTime()));
// if(reqVO.getType() == 7){//周
// referenceEndTime = DateUtil.beginOfWeek(new Date()).toLocalDateTime();
// referenceBeginTime = DateUtil.endOfWeek(new Date()).toLocalDateTime();
// }else if(reqVO.getType() == 30){//月
// referenceEndTime = DateUtil.beginOfMonth(new Date()).toLocalDateTime();
// referenceBeginTime = DateUtil.endOfMonth(new Date()).toLocalDateTime();
// }else if(reqVO.getType() == 365){//年
// referenceEndTime = DateUtil.beginOfYear(new Date()).toLocalDateTime();
// referenceBeginTime = DateUtil.endOfYear(new Date()).toLocalDateTime();
// }
List<TradeOrderTrendRespVO> reference = getOrderCountTrend(reqVO.getType(), referenceBeginTime, referenceEndTime);
// 顺序对比返回
return IntStream.range(0, value.size())
List<DataComparisonRespVO<TradeOrderTrendRespVO>> collect = IntStream.range(0, value.size())
.mapToObj(index -> new DataComparisonRespVO<TradeOrderTrendRespVO>()
.setValue(CollUtil.get(value, index))
.setReference(CollUtil.get(reference, index)))
.collect(Collectors.toList());
// 降序排序
collect.sort(Comparator.comparing(
vo -> DateUtil.parseDate(vo.getValue().getDate()), // 根据实际字段调整
Comparator.reverseOrder()
));
return collect;
}
public static void main(String[] args) {

2
hangtag-ui/hangtag-ui-admin/src/views/Home/components/TradeTrendCard.vue
View File

@ -118,7 +118,7 @@ const eChartOptions = reactive<EChartsOption>({
case TimeRangeTypeEnum.DAY30:
return formatDate(date, 'MM-DD')
case TimeRangeTypeEnum.WEEK:
let weekDay = formatDate(date, 'ddd')
let weekDay = formatDate(date, 'DDD')
if (weekDay == '0') weekDay = '日'
return '周' + weekDay
case TimeRangeTypeEnum.MONTH: