diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index 1510fb24e..741b4201c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -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; @@ -628,8 +629,8 @@ public class TempController extends BaseController { public RestApiResponse correctCombinedChargingOrder(@RequestBody QueryOrderDTO dto) { RestApiResponse response; try { - tempService.correctCombinedChargingOrder(dto); - response = new RestApiResponse<>(); + List list = tempService.correctCombinedChargingOrder(dto); + response = new RestApiResponse<>(ImmutableMap.of("correctOrderCodeList", list)); } catch (Exception e) { logger.error("校验订单是否为并充订单error", e); response = new RestApiResponse<>(); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index e3b6fbfb7..27b6f0c78 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -629,7 +629,7 @@ public class TempService { * @param dto */ @Transactional(rollbackFor = Exception.class) - public void correctCombinedChargingOrder(QueryOrderDTO dto) { + public List correctCombinedChargingOrder(QueryOrderDTO dto) { List orderCodeList = dto.getOrderCodeList(); logger.info("修正并充订单数据工具,订单号:{}", JSON.toJSONString(orderCodeList)); // 查询临时表,不要重复修正 @@ -643,7 +643,7 @@ public class TempService { } if (CollectionUtils.isEmpty(orderCodeList)) { logger.info("修正并充订单数据工具, 无需要修正的订单"); - return; + return Lists.newArrayList(); } BigDecimal multiple = new BigDecimal("2"); @@ -651,6 +651,7 @@ public class TempService { List orderBasicInfos = orderBasicInfoService.queryOrderList(orderCodeList); for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { orderBasicInfo.setOrderAmount(orderBasicInfo.getOrderAmount().multiply(multiple)); + orderBasicInfo.setVirtualAmount(orderBasicInfo.getVirtualAmount().multiply(multiple)); } // 查询订单详情数据 List orderDetailList = orderBasicInfoService.getOrderDetailList(orderCodeList); @@ -691,6 +692,8 @@ public class TempService { Map> redisMap = Maps.newHashMap(); redisMap.put(redisKey, orderCodeList); redisCache.batchSetCacheList(redisMap, 300, TimeUnit.DAYS); + + return orderCodeList; } }