From 5b1a376f79e8d614470481a0919165a26e42ce39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com> Date: Fri, 23 Jan 2026 17:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pdd/controller/PddOrderApiController.java | 2 +- .../java/cn/qihangerp/common/AjaxResult.java | 11 +++++++++- .../cn/qihangerp/common/enums/HttpStatus.java | 1 + .../service/impl/DouOrderServiceImpl.java | 21 +++++++++++++------ vue/src/views/order/order_list.vue | 3 +-- vue/src/views/pdd/order/index.vue | 4 +++- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java index 639dce5d..b519cdc4 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java @@ -127,7 +127,7 @@ public class PddOrderApiController { logs.setPullTime(currDateTime); logs.setDuration(System.currentTimeMillis() - beginTime); pullLogsService.save(logs); - return AjaxResult.error("接口拉取错误："+upResult.getMsg()); + return AjaxResult.error(upResult.getMsg()); } diff --git a/core/common/src/main/java/cn/qihangerp/common/AjaxResult.java b/core/common/src/main/java/cn/qihangerp/common/AjaxResult.java index 95fcdf3c..066d66ac 100644 --- a/core/common/src/main/java/cn/qihangerp/common/AjaxResult.java +++ b/core/common/src/main/java/cn/qihangerp/common/AjaxResult.java @@ -145,6 +145,14 @@ public class AjaxResult extends HashMap { return AjaxResult.error(msg, null); } + public static AjaxResult paramError(String msg) + { + return AjaxResult.error(ResultVoEnum.ParamsError.getIndex(),msg, null); + } + public static AjaxResult apiError(String msg) + { + return AjaxResult.error(ResultVoEnum.API_FAIL.getIndex(),msg, null); + } public static AjaxResult error(int code, String msg, Object data) { @@ -169,7 +177,8 @@ public class AjaxResult extends HashMap */ public static AjaxResult error(String msg, Object data) { - return new AjaxResult(HttpStatus.ERROR, msg, data); +// return new AjaxResult(HttpStatus.ERROR, msg, data); + return new AjaxResult(ResultVoEnum.API_FAIL.getIndex(), msg, data); } /** diff --git a/core/common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java b/core/common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java index 4fd6631f..3e62a319 100644 --- a/core/common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java +++ b/core/common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java @@ -82,6 +82,7 @@ public class HttpStatus */ public static final int ERROR = 500; + /** * 接口未实现 */ diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java index 62a812dc..5dfaae53 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java @@ -24,6 +24,8 @@ import org.springframework.util.StringUtils; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.regex.Matcher; @@ -51,14 +53,14 @@ public class DouOrderServiceImpl extends ServiceImpl private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN); @Override public PageResult queryPageList(DouOrderBo bo, PageQuery pageQuery) { - long startTimeStamp = 0; - long endTimeStamp = 0; + Long startTimestamp = null; + Long endTimestamp = null; if(StringUtils.hasText(bo.getStartTime())){ Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime()); boolean b = matcher.find(); if(b){ bo.setStartTime(bo.getStartTime()+" 00:00:00"); - startTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getStartTime()); +// startTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getStartTime()); } } if(StringUtils.hasText(bo.getEndTime())){ @@ -66,16 +68,23 @@ public class DouOrderServiceImpl extends ServiceImpl boolean b = matcher.find(); if(b){ bo.setEndTime(bo.getEndTime()+" 23:59:59"); - endTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getEndTime()); +// endTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getEndTime()); } } + if(StringUtils.hasText(bo.getStartTime())) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime startTime = LocalDateTime.parse(bo.getStartTime(), formatter); + LocalDateTime endTime = LocalDateTime.parse(bo.getEndTime(), formatter); + startTimestamp = startTime.toEpochSecond(ZoneOffset.ofHours(8)); + endTimestamp = endTime.toEpochSecond(ZoneOffset.ofHours(8)); + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(bo.getShopId()!=null,DouOrder::getSShopId,bo.getShopId()) .eq(StringUtils.hasText(bo.getOrderId()),DouOrder::getOrderId,bo.getOrderId()) .eq(StringUtils.hasText(bo.getOrderStatus()),DouOrder::getOrderStatus,bo.getOrderStatus()) - .ge(StringUtils.hasText(bo.getStartTime()),DouOrder::getCreateTime, startTimeStamp) - .le(StringUtils.hasText(bo.getEndTime()),DouOrder::getCreateTime,endTimeStamp) + .ge(StringUtils.hasText(bo.getStartTime()),DouOrder::getCreateTime, startTimestamp) + .le(StringUtils.hasText(bo.getEndTime()),DouOrder::getCreateTime,endTimestamp) ; pageQuery.setOrderByColumn("create_time"); pageQuery.setIsAsc("desc"); diff --git a/vue/src/views/order/order_list.vue b/vue/src/views/order/order_list.vue index 5692920a..7401ab86 100644 --- a/vue/src/views/order/order_list.vue +++ b/vue/src/views/order/order_list.vue @@ -19,11 +19,10 @@ {{ item.name }} 微信小店 京东POP - 京东自营 淘宝天猫 拼多多 抖店 - 线下渠道 + 其他 diff --git a/vue/src/views/pdd/order/index.vue b/vue/src/views/pdd/order/index.vue index be69ce4a..c243f7b6 100644 --- a/vue/src/views/pdd/order/index.vue +++ b/vue/src/views/pdd/order/index.vue @@ -475,9 +475,11 @@ export default { }); // return Promise.reject('无效的会话，或者会话已过期，请重新登录。') - }else{ + }else if(response.code === 200){ this.$modal.msgSuccess(JSON.stringify(response)); this.getList() + }else{ + this.$modal.msgError(response.msg) } this.pullLoading = false })