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

Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-08-01 09:26:13 +08:00
parent 7d8c2fcb18 4346e9fc1f
commit eb07babbb6
67 changed files with 2091 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
View File

@@ -153,16 +153,17 @@ public class PersonPileController extends BaseController {
@GetMapping("/getPersonalPileList")
public RestApiResponse<?> getPersonalPileList(HttpServletRequest request) {
RestApiResponse<?> response = null;
String memberId = null;
try {
String memberId = getMemberIdByAuthorization(request);
logger.info("通过memberId查个人桩列表 params: {}", memberId);
memberId = getMemberIdByAuthorization(request);
// logger.info("通过memberId查个人桩列表 params: {}", memberId);
List<PersonalPileInfoVO> list = pileBasicInfoService.getPileInfoByMemberId(memberId);
response = new RestApiResponse<>(list);
} catch (Exception e) {
logger.error("通过memberId查个人桩列表异常", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PERSONAL_PILE_BY_MEMBER_ID_ERROR);
}
logger.info("通过memberId查个人桩列表 result:{}", response);
logger.info("通过memberId查个人桩列表, params: {}, result:{}", memberId, response);
return response;
}
@@ -179,8 +180,8 @@ public class PersonPileController extends BaseController {
public RestApiResponse<?> getConnectorRealTimeInfo(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto) {
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
// String memberId = getMemberIdByAuthorization(request);
// dto.setMemberId(memberId);
PersonPileRealTimeVO connectorRealTimeInfo = pileService.getConnectorRealTimeInfo(dto);
response = new RestApiResponse<>(connectorRealTimeInfo);
} catch (BusinessException e) {

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

@@ -663,15 +663,17 @@ public class OrderService {
}
}
try {
// 因为原来的数据在redis中是永久保存，所以这里做下查询详情的时候，发现已经是完成的订单，redis数据存到表中
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
// 如果是已完成的订单，把redis中的实时数据存到表中
orderBasicInfoService.realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderBasicInfo.getOrderCode());
// 因为原来的数据在redis中是永久保存，所以这里做下查询详情的时候，发现已经是完成的订单，redis数据存到表中
CompletableFuture.runAsync(() -> {
try {
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
// 如果是已完成的订单，把redis中的实时数据存到表中
orderBasicInfoService.realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderBasicInfo.getOrderCode());
}
} catch (Exception e) {
log.error("后管查询订单详情时把redis中的实时数据存到表发生异常", e);
}
} catch (Exception e) {
log.error("后管查询订单详情时把redis中的实时数据存到表发生异常", e);
}
});
return vo;
}