From 001eb2cfbe3c435f1ca0e1ae702883cf77857739 Mon Sep 17 00:00:00 2001 From: yuyang Date: Mon, 25 Jul 2022 17:36:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E=E6=9C=AC=E5=9C=B0=E6=97=B6=E9=97=B42=E5=88=86?= =?UTF-8?q?=E9=92=9F=E8=AE=A2=E5=8D=95=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=B7=A5=E5=8D=95=E6=8F=90=E7=A4=BA=E8=BF=90?= =?UTF-8?q?=E7=BB=B4=E4=BA=BA=E5=91=98=E8=BF=9B=E8=A1=8C=E6=A0=A1=E6=97=B6?= =?UTF-8?q?=E6=95=88=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/api/XhpcPileOrderController.java | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 9a993943..83cdf2ec 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.xhpc.common.api.UserTypeService; import com.xhpc.common.api.WebSocketService; +import com.xhpc.common.api.WorkOrderYuService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.data.redis.CacheOrderData; @@ -54,6 +55,9 @@ public class XhpcPileOrderController extends BaseController { @Autowired private UserTypeService userTypeService; + @Autowired + private WorkOrderYuService workOrderYuService; + private static final Logger logger = LoggerFactory.getLogger(XhpcPileOrderController.class); /** @@ -515,17 +519,18 @@ public class XhpcPileOrderController extends BaseController { logger.info("开始时间大于本地时间2天>>>>>orderNo：" + orderNo); xhpcChargeOrder.setStatus(2); xhpcChargeOrder.setUpdateTime(new Date()); - xhpcChargeOrder.setErroRemark("开始时间大于本地时间2天"); + xhpcChargeOrder.setErroRemark("开始时间大于本地时间2天,需要进行时间效验"); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); + extracted(); return R.fail(500,"无效订单号："+orderNo); } - long betweenEnd = DateUtil.between(endTime, dateUtil, DateUnit.DAY); - if(betweenEnd>2){ - logger.info("结束时间大于本地时间2天>>>>>orderNo：" + orderNo); + if(endTime.getTime()-dateUtil.getTime()>120000){ + logger.info("结束时间大于本地时间2分钟,需要进行时间效验>>>>>orderNo：" + orderNo); xhpcChargeOrder.setStatus(2); xhpcChargeOrder.setUpdateTime(new Date()); - xhpcChargeOrder.setErroRemark("结束时间大于本地时间2天"); + xhpcChargeOrder.setErroRemark("结束时间大于本地时间2分钟,需要进行时间效验"); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); + extracted(); return R.fail(500,"无效订单号："+orderNo); } //结束时间小于开始时间 @@ -533,7 +538,7 @@ public class XhpcPileOrderController extends BaseController { logger.info("开始时间大于结束时间>>>>>orderNo：" + orderNo); xhpcChargeOrder.setStatus(2); xhpcChargeOrder.setUpdateTime(new Date()); - xhpcChargeOrder.setErroRemark("开始时间大于结束时间"); + xhpcChargeOrder.setErroRemark("开始时间大于结束时间,需要进行时间效验"); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); return R.fail(500,"无效订单号："+orderNo); } @@ -645,6 +650,8 @@ public class XhpcPileOrderController extends BaseController { } + + /** * 订单异常回调接口 */ @@ -765,4 +772,11 @@ public R pileStartUpBy3rd(@RequestParam(value = "internetSerialNumber") String i return xhpcChargeOrderService.startUpBy3rd(internetSerialNumber, driverId, chargingAmt, plateNum, status, connectorId); } + + + private void extracted() { + Date date = DateUtil.date(); + workOrderYuService.addNewOrder("28","有异常订单订单且该桩进行校时效价处理","定时任务自动扫描异常订单",date,""); + } + }