diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 2c0826dff..8626d132f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -129,7 +129,7 @@ public class OrderService { * @param dto * @return */ - public String generateOrder(GenerateOrderDTO dto) { + public String generateOrder(GenerateOrderDTO dto) throws ParseException { log.info("generateOrder param:{}", JSONObject.toJSONString(dto)); // 处理前端传的参数 analysisPileParameter(dto); @@ -316,7 +316,7 @@ public class OrderService { * @param dto * @return */ - private String saveOrder2Database(GenerateOrderDTO dto) { + private String saveOrder2Database(GenerateOrderDTO dto) throws ParseException { String orderCode = IdUtils.getOrderCode(); String transactionCode = IdUtils.generateTransactionCode(dto.getPileSn(), dto.getConnectorCode()); @@ -340,7 +340,7 @@ public class OrderService { .payMode(dto.getPayMode()) .orderAmount(BigDecimal.ZERO) .startType(dto.getStartType()) - .appointmentTime(dto.getAppointmentTime()) + .appointmentTime(DateUtils.parseDate(dto.getAppointmentTime(), DateUtils.YYYY_MM_DD_HH_MM_SS)) .build(); // 订单详情 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java index 94fef4183..14a9a2555 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; +import java.text.ParseException; /** * 远程控制controller @@ -59,7 +59,12 @@ public class PileRemoteController { // pileRemoteService.remoteStartCharging(queryPileDTO.getPileSn(), queryPileDTO.getConnectorCode()); // 生成订单并远程启动充电 dto.setStartMode(Constants.ZERO); - String orderCode = orderService.generateOrder(dto); + String orderCode = null; + try { + orderCode = orderService.generateOrder(dto); + } catch (Exception e) { + e.printStackTrace(); + } return AjaxResult.success(ImmutableMap.of("orderCode", orderCode)); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java index 77fef4edd..d79b279a6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; -import java.util.Date; /** * 生成订单dto @@ -59,5 +58,5 @@ public class GenerateOrderDTO extends BasicPileDTO{ /** * 预约时间 */ - private Date appointmentTime; + private String appointmentTime; }