mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-13 11:49:49 +08:00
校验是否为并充订单
This commit is contained in:
@@ -587,29 +587,34 @@ public class TempService {
|
|||||||
*/
|
*/
|
||||||
public Map<String, List<String>> checkCombinedChargingOrder(List<String> orderCodeList) throws BaseAdaPayException {
|
public Map<String, List<String>> checkCombinedChargingOrder(List<String> orderCodeList) throws BaseAdaPayException {
|
||||||
Map<String, List<String>> resultMap = Maps.newHashMap();
|
Map<String, List<String>> resultMap = Maps.newHashMap();
|
||||||
Set<String> combinedChargingOrderList = Sets.newHashSet();
|
List<String> combinedChargingOrderList = Lists.newArrayList();
|
||||||
Set<String> notCombinedChargingOrderList = Sets.newHashSet();
|
List<String> notCombinedChargingOrderList = Lists.newArrayList();
|
||||||
|
List<String> noDataOrderList = Lists.newArrayList();
|
||||||
for (String orderCode : orderCodeList) {
|
for (String orderCode : orderCodeList) {
|
||||||
// 查询orderMonitorData
|
// 查询orderMonitorData
|
||||||
OrderMonitorData orderMonitorData = orderMonitorDataService.selectByOrderCode(orderCode);
|
OrderMonitorData orderMonitorData = orderMonitorDataService.selectByOrderCode(orderCode);
|
||||||
if (orderMonitorData == null) {
|
if (orderMonitorData == null) {
|
||||||
logger.info("订单:{}不存在", orderCode);
|
logger.info("订单:{}不存在", orderCode);
|
||||||
|
noDataOrderList.add(orderCode);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
JSONArray jsonArray = JSONArray.parseArray(orderMonitorData.getMonitorData());
|
JSONArray jsonArray = JSONArray.parseArray(orderMonitorData.getMonitorData());
|
||||||
|
List<BigDecimal> orderOutputCurrentList = Lists.newArrayList();
|
||||||
for (int i = 0; i < jsonArray.size(); i++) {
|
for (int i = 0; i < jsonArray.size(); i++) {
|
||||||
JSONObject jsonObject = jsonArray.getJSONObject(i);
|
JSONObject jsonObject = jsonArray.getJSONObject(i);
|
||||||
String outputCurrent = jsonObject.getString("outputCurrent");
|
String outputCurrent = jsonObject.getString("outputCurrent");
|
||||||
if (new BigDecimal(outputCurrent).compareTo(new BigDecimal(250)) > 0) {
|
orderOutputCurrentList.add(new BigDecimal(outputCurrent));
|
||||||
logger.info("订单:{},第{}条数据,输出电流:{},大于250,为并充订单", orderCode, i, outputCurrent);
|
|
||||||
combinedChargingOrderList.add(orderCode);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
// 如果orderOutputCurrentList中任意一值大于250,判定为并充订单
|
||||||
|
if (orderOutputCurrentList.stream().anyMatch(current -> current.compareTo(new BigDecimal("250")) > 0)) {
|
||||||
|
combinedChargingOrderList.add(orderCode);
|
||||||
|
} else {
|
||||||
notCombinedChargingOrderList.add(orderCode);
|
notCombinedChargingOrderList.add(orderCode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
resultMap.put("combinedChargingOrderList", Lists.newArrayList(combinedChargingOrderList));
|
resultMap.put("combinedChargingOrderList", combinedChargingOrderList);
|
||||||
resultMap.put("notCombinedChargingOrderList", Lists.newArrayList(notCombinedChargingOrderList));
|
resultMap.put("notCombinedChargingOrderList", notCombinedChargingOrderList);
|
||||||
|
resultMap.put("noDataOrderList", noDataOrderList);
|
||||||
return resultMap;
|
return resultMap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user