From 8247b3b4bdf53930753c901071acbb219db6d9db Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Wed, 4 Sep 2024 10:19:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98=EF=BC=8C=E5=82=A8=E5=80=BC?= =?UTF-8?q?=E5=8D=A1=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java index 6906d971..90640034 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java @@ -134,6 +134,7 @@ public class TbPayServiceImpl implements TbPayService { body.append(cashierCart.getName()); } + BigDecimal payMount = orderInfo.getOrderAmount().multiply(BigDecimal.valueOf(scanPayDTO.getDiscount()).setScale(2, RoundingMode.HALF_UP)); TbMerchantThirdApply thirdApply = merchantThirdApplyRepository.getById(Integer.valueOf(orderInfo.getMerchantId())); if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) { @@ -173,7 +174,7 @@ public class TbPayServiceImpl implements TbPayService { if (ObjectUtil.isEmpty(payment) || payment == null) { payment = new TbOrderPayment(); payment.setPayTypeId("ysk"); - payment.setAmount(orderInfo.getOrderAmount().doubleValue()); + payment.setAmount(payMount.doubleValue()); payment.setPaidAmount(orderInfo.getPayAmount().doubleValue()); payment.setHasRefundAmount((double) 0); payment.setPayName(payName); @@ -193,7 +194,7 @@ public class TbPayServiceImpl implements TbPayService { } - orderInfo.setPayAmount(orderInfo.getOrderAmount()); + orderInfo.setPayAmount(payMount); orderInfo.setPayType(qpay); orderInfo.setUpdatedAt(System.currentTimeMillis()); orderInfoMapper.update(orderInfo, new LambdaUpdateWrapper()