diff --git a/jsowell-admin/pom.xml b/jsowell-admin/pom.xml index b0ebfe083..6ba438823 100644 --- a/jsowell-admin/pom.xml +++ b/jsowell-admin/pom.xml @@ -50,10 +50,10 @@ - + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 95d4d334c..55c3eed0c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -210,10 +210,5 @@ public interface IOrderBasicInfoService { */ void updateOrderStatusAsAbnormal(String pileSn); - /** - * 预约订单启动 - */ - void appointmentOrderStart(); - List getAppointmentOrder(LocalDateTime dateTime); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index a889b74bb..ef2a3fb02 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -41,6 +41,7 @@ import com.jsowell.pile.service.IOrderAbnormalRecordService; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IOrderPayRecordService; import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.service.IPileBillingTemplateService; import com.jsowell.pile.service.IPileConnectorInfoService; import com.jsowell.pile.service.WechatPayService; import com.jsowell.pile.service.WxpayCallbackRecordService; @@ -52,6 +53,7 @@ import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.OrderVO; import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; import com.jsowell.pile.vo.uniapp.SendMessageVO; +import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.IndexOrderInfoVO; import com.jsowell.pile.vo.web.OrderListVO; import com.jsowell.pile.vo.web.OrderTotalDataVO; @@ -131,6 +133,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { @Autowired private WxpayRefundCallbackService wxpayRefundCallbackService; + @Autowired + private IPileBillingTemplateService pileBillingTemplateService; + /** * 查询订单 * diff --git a/jsowell-quartz/pom.xml b/jsowell-quartz/pom.xml index 86fde5deb..47bbe267d 100644 --- a/jsowell-quartz/pom.xml +++ b/jsowell-quartz/pom.xml @@ -47,6 +47,7 @@ jsowell-admin 1.0.0 + diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index e3b453421..9637294bc 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -3,7 +3,10 @@ package com.jsowell.quartz.task; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.service.IOrderBasicInfoService; +import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.service.OrderService; +import com.jsowell.service.PileRemoteService; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,6 +28,12 @@ public class JsowellTask { @Autowired private OrderService orderService; + @Autowired + private IPileBillingTemplateService pileBillingTemplateService; + + @Autowired + private PileRemoteService pileRemoteService; + /** * 关闭15分钟未支付的订单 * close15MinutesOfUnpaidOrders @@ -55,8 +64,15 @@ public class JsowellTask { if (CollectionUtils.isEmpty(list)) { return; } - for (OrderBasicInfo order : list) { - orderService.startCharging(order); + for (OrderBasicInfo orderInfo : list) { + String pileSn = orderInfo.getPileSn(); + // 发送启动充电指令前,再次下发计费模板 + BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(pileSn); + if (billingTemplateVO != null) { + pileRemoteService.publishPileBillingTemplate(pileSn, billingTemplateVO); + } + // 发送启动指令 + pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), orderInfo.getPayAmount()); } } }