autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-03-29 08:21:12 +08:00
parent 358ece2923
commit d2e54dbb92
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -129,7 +129,7 @@ public class OrderService {
* @param dto * @param dto
* @return * @return
*/ */
public String generateOrder(GenerateOrderDTO dto) { public String generateOrder(GenerateOrderDTO dto) throws ParseException {
log.info("generateOrder param:{}", JSONObject.toJSONString(dto)); log.info("generateOrder param:{}", JSONObject.toJSONString(dto));
// 处理前端传的参数 // 处理前端传的参数
analysisPileParameter(dto); analysisPileParameter(dto);
@@ -316,7 +316,7 @@ public class OrderService {
* @param dto * @param dto
* @return * @return
*/ */
private String saveOrder2Database(GenerateOrderDTO dto) { private String saveOrder2Database(GenerateOrderDTO dto) throws ParseException {
String orderCode = IdUtils.getOrderCode(); String orderCode = IdUtils.getOrderCode();
String transactionCode = IdUtils.generateTransactionCode(dto.getPileSn(), dto.getConnectorCode()); String transactionCode = IdUtils.generateTransactionCode(dto.getPileSn(), dto.getConnectorCode());
@@ -340,7 +340,7 @@ public class OrderService {
.payMode(dto.getPayMode()) .payMode(dto.getPayMode())
.orderAmount(BigDecimal.ZERO) .orderAmount(BigDecimal.ZERO)
.startType(dto.getStartType()) .startType(dto.getStartType())
.appointmentTime(dto.getAppointmentTime()) .appointmentTime(DateUtils.parseDate(dto.getAppointmentTime(), DateUtils.YYYY_MM_DD_HH_MM_SS))
.build(); .build();
// 订单详情 // 订单详情

9
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java
View File

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.text.ParseException;
/** /**
* 远程控制controller * 远程控制controller
@@ -59,7 +59,12 @@ public class PileRemoteController {
// pileRemoteService.remoteStartCharging(queryPileDTO.getPileSn(), queryPileDTO.getConnectorCode()); // pileRemoteService.remoteStartCharging(queryPileDTO.getPileSn(), queryPileDTO.getConnectorCode());
// 生成订单并远程启动充电 // 生成订单并远程启动充电
dto.setStartMode(Constants.ZERO); 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)); return AjaxResult.success(ImmutableMap.of("orderCode", orderCode));
} }

3
jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java
View File

@@ -6,7 +6,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* 生成订单dto * 生成订单dto
@@ -59,5 +58,5 @@ public class GenerateOrderDTO extends BasicPileDTO{
/** /**
* 预约时间 * 预约时间
*/ */
private Date appointmentTime; private String appointmentTime;
} }