From 9057f0abd6f534835f39ebecb12a0685241b7f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com> Date: Mon, 26 Jan 2026 09:52:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96jd=E8=AE=A2=E5=8D=95=E6=8B=89?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/jd/controller/JdOrderController.java | 12 +----------- .../oms/pdd/controller/PddOrderController.java | 17 ----------------- .../oms/tao/controller/TaoOrderController.java | 17 +---------------- .../module/service/impl/JdOrderServiceImpl.java | 16 ++++++++++------ vue/src/views/jd/order/index.vue | 17 ++++++++--------- 5 files changed, 20 insertions(+), 59 deletions(-) diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java index eeee63fb..2f84ce1b 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java @@ -28,15 +28,5 @@ public class JdOrderController extends BaseController { return getDataTable(result); } - @PostMapping("/push_oms") - @ResponseBody - public AjaxResult pushOms(@RequestBody JdOrderPushBo bo) { - // TODO:需要优化消息格式 - if(bo!=null && bo.getIds()!=null) { - for(String id: bo.getIds()) { - mqUtils.sendApiMessage(MqMessage.build(EnumShopType.JD, MqType.ORDER_MESSAGE, id)); - } - } - return success(); - } + } diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java index 50504355..5e04f9ea 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java @@ -43,23 +43,6 @@ public class PddOrderController extends BaseController { return success(orderService.queryDetailById(id)); } - /** - * 手动推送到系统 - * @param bo - * @return - */ - @PostMapping("/push_oms") - @ResponseBody - public AjaxResult pushOms(@RequestBody PddOrderPushBo bo) { - // TODO:需要优化消息格式 - if(bo!=null && bo.getIds()!=null) { - for(String id: bo.getIds()) { - mqUtils.sendApiMessage(MqMessage.build(EnumShopType.PDD, MqType.ORDER_MESSAGE, id)); - } - } - return success(); - } - @PostMapping("/confirmOrder") public AjaxResult confirmOrder(@RequestBody PddOrderConfirmBo bo) { log.info("=========确认订单======={}", JSONObject.toJSONString(bo)); diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java index 9ec763a6..54b4ad74 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java @@ -42,22 +42,7 @@ public class TaoOrderController extends BaseController { return success(taoOrder); } - /** - * 手动推送到系统 - * @param bo - * @return - */ - @PostMapping("/push_oms") - @ResponseBody - public AjaxResult pushOms(@RequestBody TaoOrderPushBo bo) { - // TODO:需要优化消息格式 - if(bo!=null && bo.getIds()!=null) { - for(String id: bo.getIds()) { - mqUtils.sendApiMessage(MqMessage.build(EnumShopType.TAO, MqType.ORDER_MESSAGE, id)); - } - } - return success(); - } + @PostMapping("/confirmOrder") public AjaxResult confirmOrder(@RequestBody TaoOrderConfirmBo bo) { diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java index c3ad3c54..d7a026ee 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java @@ -49,24 +49,28 @@ public class JdOrderServiceImpl extends ServiceImpl if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){ Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime()); boolean b = matcher.find(); - if(b){ - bo.setStartTime(bo.getStartTime()+" 00:00:00"); + if(!b){ + bo.setEndTime(""); +// bo.setStartTime(bo.getStartTime()+" 00:00:00"); } } if(org.springframework.util.StringUtils.hasText(bo.getEndTime())){ Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime()); boolean b = matcher.find(); - if(b){ - bo.setEndTime(bo.getEndTime()+" 23:59:59"); + if(!b){ +// bo.setEndTime(bo.getEndTime()+" 23:59:59"); + bo.setStartTime(""); } + }else{ + bo.setEndTime(bo.getStartTime()); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(bo.getShopId()!=null,JdOrder::getShopId,bo.getShopId()) .eq(StringUtils.hasText(bo.getOrderId()),JdOrder::getOrderId,bo.getOrderId()) .eq(StringUtils.hasText(bo.getOrderState()),JdOrder::getOrderState,bo.getOrderState()) - .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),JdOrder::getOrderStartTime,bo.getStartTime()) - .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),JdOrder::getOrderStartTime,bo.getEndTime()) + .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),JdOrder::getOrderStartTime,bo.getStartTime()+" 00:00:00") + .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),JdOrder::getOrderStartTime,bo.getEndTime()+" 23:59:59") ; pageQuery.setOrderByColumn("order_start_time"); diff --git a/vue/src/views/jd/order/index.vue b/vue/src/views/jd/order/index.vue index 2e805eba..14cfc8ec 100644 --- a/vue/src/views/jd/order/index.vue +++ b/vue/src/views/jd/order/index.vue @@ -19,13 +19,10 @@ - - + + @@ -284,8 +281,10 @@ export default { this.queryParams.startTime = this.orderTime[0] this.queryParams.endTime = this.orderTime[1] }else { - this.queryParams.startTime = null - this.queryParams.endTime = null + if(!this.queryParams.startTime) { + this.queryParams.startTime = null + this.queryParams.endTime = null + } } this.loading = true; listOrder(this.queryParams).then(response => {