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

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

Browse Source 
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
#	jsowell-admin/src/test/java/SpringBootTestController.java
This commit is contained in:
Guoqs
2024-11-16 14:27:13 +08:00
parent 644dc64eea 92a8e25df2
commit 1a3ac55f14
31 changed files with 1560 additions and 1191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package com.jsowell.api.uniapp.customer;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.jsowell.adapay.dto.BalancePaymentRequestDTO;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.annotation.Anonymous;
@@ -596,4 +597,56 @@ public class TempController extends BaseController {
rabbitTemplate.convertAndSend(dto.getExchange(), dto.getRoutingKey(), dto.getData());
return new RestApiResponse<>();
}
/* 计算订单耗电量
* dto.setStationId("657");
* dto.setStartTime("2024-10-23 00:00:00");
* dto.setEndTime("2024-11-07 23:59:59");
*/
@PostMapping("/calculateOrderElectricity")
public RestApiResponse<?> calculateOrderElectricity(@RequestBody QueryOrderDTO dto) {
RestApiResponse<?> response;
try {
tempService.calculateOrderElectricity(dto);
response = new RestApiResponse<>();
} catch (Exception e) {
logger.error("计算订单耗电量error", e);
response = new RestApiResponse<>();
}
return response;
}
/**
* 校验订单是否为并充订单
* https://localhost:8080/temp/checkCombinedChargingOrder
*/
@PostMapping("/checkCombinedChargingOrder")
public RestApiResponse<?> checkCombinedChargingOrder(@RequestBody QueryOrderDTO dto) {
RestApiResponse<?> response;
try {
Map<String, List<String>> map = tempService.checkCombinedChargingOrder(dto.getOrderCodeList());
response = new RestApiResponse<>(map);
} catch (Exception e) {
logger.error("校验订单是否为并充订单error", e);
response = new RestApiResponse<>();
}
return response;
}
/**
* 并充订单数据修正
* https://localhost:8080/temp/correctCombinedChargingOrder
*/
@PostMapping("/correctCombinedChargingOrder")
public RestApiResponse<?> correctCombinedChargingOrder(@RequestBody QueryOrderDTO dto) {
RestApiResponse<?> response;
try {
List<String> list = tempService.correctCombinedChargingOrder(dto);
response = new RestApiResponse<>(ImmutableMap.of("correctOrderCodeList", list));
} catch (Exception e) {
logger.error("校验订单是否为并充订单error", e);
response = new RestApiResponse<>();
}
return response;
}
}