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

Merge branch 'dev-new' into dev-new-rabbitmq

Browse Source
This commit is contained in:
Guoqs
2024-12-31 11:39:26 +08:00
parent b0e6cd6219 a5a14c9e99
commit 3b8224abb0
6 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
View File

@@ -649,4 +649,21 @@ public class TempController extends BaseController {
}
return response;
}
/**
* 临时接口, 关闭未支付订单
* https://localhost:8080/temp/closeUnpaidOrder
*/
@PostMapping("/closeUnpaidOrder")
public RestApiResponse<?> closeUnpaidOrder(@RequestBody QueryOrderDTO dto) {
RestApiResponse<?> response;
try {
tempService.closeUnpaidOrder(dto);
response = new RestApiResponse<>();
} catch (Exception e) {
logger.error("临时接口, 关闭未支付订单error", e);
response = new RestApiResponse<>();
}
return response;
}
}

11
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -713,5 +713,16 @@ public class TempService {
return orderCodeList;
}
/**
* 关闭未支付订单
*/
public void closeUnpaidOrder(QueryOrderDTO dto) {
// 查询未支付订单
List<OrderBasicInfo> unpaidOrderList = orderBasicInfoService.getUnpaidOrderList(dto.getStartTime(), dto.getEndTime());
logger.info("closeUnpaidOrders, startTime:{}, endTime:{}, 未支付订单:{}", dto.getStartTime(), dto.getEndTime(), JSON.toJSONString(unpaidOrderList));
// 关闭未支付订单
orderBasicInfoService.closeUnpaidOrders(unpaidOrderList);
}
}

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

@@ -95,7 +95,7 @@ public class PileRemoteController extends BaseController {
if (StringUtils.isBlank(dto.getPileSn()) || StringUtils.isBlank(dto.getConnectorCode())) {
throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
}
pileRemoteService.remoteStopCharging(dto.getPileSn(), dto.getConnectorCode(), null);
pileRemoteService.remoteStopCharging(dto.getPileSn(), dto.getConnectorCode(), dto.getTransactionCode());
ajaxResult = AjaxResult.success();
} catch (BusinessException e) {
ajaxResult = AjaxResult.error(e.getCode(), e.getMessage());