diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java index 57f05bb7c..1adaf651b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java @@ -108,8 +108,8 @@ public class JumpController extends BaseController { logger.info("临时刷数据接口 param:{}", dto); RestApiResponse response = null; try { - orderBasicInfoService.tempUpdateVirtualAmount(dto); - response = new RestApiResponse<>(); + String s = orderBasicInfoService.tempUpdateVirtualAmount(dto); + response = new RestApiResponse<>(s); } catch (BusinessException e) { logger.warn("临时刷数据接口 warn", e); response = new RestApiResponse<>(e.getCode(), e.getMessage()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 424516c6d..360db83f3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -255,5 +255,5 @@ public interface IOrderBasicInfoService { List transformPeriodAmountByOrderDetail(OrderDetail orderDetail); - void tempUpdateVirtualAmount(QueryOrderDTO dto); + String tempUpdateVirtualAmount(QueryOrderDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index e3c68db0f..dc2128f45 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -163,9 +163,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus())); } - - // 异步修改 虚拟金额和结算金额 - tempUpdateVirtualAmount(orderListVOS); } return orderListVOS; } @@ -177,6 +174,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } // 订单总消费金额 BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount()); + // 使用虚拟金额消费 金额 BigDecimal virtualAmount = BigDecimal.ZERO; // 结算金额 @@ -194,10 +192,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal bigDecimal = orderPayRecord.getRefundAmount() == null ? BigDecimal.ZERO : orderPayRecord.getRefundAmount(); virtualAmount = orderPayRecord.getPayAmount().subtract(bigDecimal); settleAmount = orderAmount.subtract(virtualAmount); + } else { + settleAmount = orderAmount; } } - - } else if (StringUtils.equals(orderListVO.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { + } else { /* 微信支付 虚拟金额为0 结算金额等于订单消费金额 */ @@ -205,6 +204,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } OrderBasicInfo build = OrderBasicInfo.builder() + .id(Long.parseLong(orderListVO.getId())) .orderCode(orderListVO.getOrderCode()) .virtualAmount(virtualAmount) .settleAmount(settleAmount) @@ -1690,11 +1690,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } @Override - public void tempUpdateVirtualAmount(QueryOrderDTO dto) { + public String tempUpdateVirtualAmount(QueryOrderDTO dto) { + dto.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue()); List orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); if (CollectionUtils.isEmpty(orderListVOS)) { - return; + return "没有订单需要修改"; } tempUpdateVirtualAmount(orderListVOS); + return "共修改" + orderListVOS.size() + "条订单数据"; } }