From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Mon, 05 Apr 2021 22:48:14 +0800 Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算 --- zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java index 3769823..a3ad197 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java @@ -3,6 +3,7 @@ import com.matrix.core.pojo.AjaxResult; import com.matrix.core.tools.DateUtil; import com.matrix.core.tools.LogUtil; +import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.excl.ExcelSheetPO; import com.matrix.core.tools.excl.ExcelUtil; import com.matrix.core.tools.excl.ExcelVersion; @@ -48,6 +49,10 @@ @PostMapping(value = "/findOrderFlow") public @ResponseBody AjaxResult findOrderFlow(@RequestBody OrderFlowListDto orderFlowListDto) { + if(StringUtils.isBlank(orderFlowListDto.getSort())){ + orderFlowListDto.setSort("createTime"); + orderFlowListDto.setOrder("desc"); + } if (!DataAuthUtil.hasAllShopAuth()) { QueryUtil.setQueryLimit(orderFlowListDto); } else { -- Gitblit v1.9.1