From 3e6ef0cb3a47b7551bf3eab0375c58c2cc342bc3 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 27 Feb 2024 16:48:14 +0800 Subject: [PATCH] update --- .../impl/OrderBasicInfoServiceImpl.java | 60 ------------------- 1 file changed, 60 deletions(-) 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 ea7920076..eb642b700 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 @@ -332,66 +332,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } - /*private void tempUpdateVirtualAmount(OrderListVO orderListVO) { - if (orderListVO.getVirtualAmount() != null) { - return; - } - // 订单总消费金额 - BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount()); - // 支付金额 - BigDecimal payAmount = new BigDecimal(orderListVO.getPayAmount()); - - if (orderAmount.compareTo(payAmount) > 0) { - orderAmount = payAmount; - } - - // 使用虚拟金额消费 金额 - BigDecimal virtualAmount = BigDecimal.ZERO; - // 结算金额 - BigDecimal settleAmount = BigDecimal.ZERO; - - if (orderAmount.compareTo(BigDecimal.ZERO) > 0) { - if (StringUtils.equals(orderListVO.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { - *//* - 余额支付 查询支付记录,如全部用本金支付,则虚拟金额为0,结算金额为订单消费金额, - 如果使用了赠送金额,虚拟金额为赠送金额支付部分,结算金额=订单消费金额-虚拟金额消费部分 - *//* - // 查询支付记录 - List orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderListVO.getOrderCode()); - for (OrderPayRecord orderPayRecord : orderPayRecordList) { - if (StringUtils.equals(orderPayRecord.getPayMode(), OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) { - BigDecimal refundAmount = orderPayRecord.getRefundAmount(); - if (refundAmount == null) { - // 退款金额为null, 需要退款的金额 = 支付金额 - 订单金额 - refundAmount = orderPayRecord.getPayAmount().subtract(orderAmount); - } - // 赠送金额消费部分 = 支付金额 - 需要退款金额 - virtualAmount = orderPayRecord.getPayAmount().subtract(refundAmount); - // 结算金额 = 订单金额 - 赠送金额消费部分 - settleAmount = orderAmount.subtract(virtualAmount); - } else { - // 没有使用赠送金额支付,那么虚拟金额就是0,结算金额就等于订单金额 - settleAmount = orderAmount; - } - } - } else { - *//* - 微信支付 虚拟金额为0 结算金额等于订单消费金额 - *//* - settleAmount = orderAmount; - } - } - - OrderBasicInfo build = OrderBasicInfo.builder() - .id(Long.parseLong(orderListVO.getId())) - .orderCode(orderListVO.getOrderCode()) - .orderAmount(orderAmount) - .virtualAmount(virtualAmount) - .settleAmount(settleAmount) - .build(); - updateOrderBasicInfo(build); - }*/ - /** * 通过订单状态和支付状态 转换订单状态描述 *