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,""); + } + }