From 210fa52784481169d8d55faf55d7d59356394a69 Mon Sep 17 00:00:00 2001 From: "geng.tang@qq.com" Date: Fri, 26 Jan 2024 16:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=94=AF=E4=BB=98=E6=8A=BC?= =?UTF-8?q?=E9=87=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/controller/FreezeOrderController.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java index 4170f9f..0c3c3c2 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java @@ -227,7 +227,8 @@ public class FreezeOrderController extends BaseController { FreezeOrder one = freezeOrderService.lambdaQuery().eq(FreezeOrder::getNotifyId, notify_id).last("limit 1").one(); if(one == null) { - FreezeOrder freezeOrder = freezeOrderService.lambdaQuery().eq(FreezeOrder::getOutRequestNo, out_request_no).one(); + FreezeOrder freezeOrder = freezeOrderService.lambdaQuery().eq(FreezeOrder::getOutRequestNo, out_request_no) + .eq(FreezeOrder::getStatus, "INIT").last("limit 1").one(); if(freezeOrder == null) { freezeOrder = new FreezeOrder(); } @@ -253,7 +254,7 @@ public class FreezeOrderController extends BaseController { .eq(FreezeOrder::getStatus, "INIT") .eq(FreezeOrder::getId, freezeOrder.getId()); boolean delRet = freezeOrderService.remove(fWrapper); - log.info("删除无效冻结订单{}条！冻结单号{}", delRet, out_order_no); + log.info("删除无效冻结订单结果{}！冻结单号{}", delRet, out_order_no); BigDecimal bAmount = freezeOrder.getAmount(); LambdaQueryWrapper orderWrapper = Wrappers.lambdaQuery(); @@ -263,11 +264,14 @@ public class FreezeOrderController extends BaseController { orderService.updateById(order); log.info("更新冻结金额！冻结单号{}", out_order_no); - LambdaUpdateWrapper orderPayWrapper = Wrappers.lambdaUpdate(); - orderPayWrapper.eq(OrderPay::getRentOrderId, order.getOrderId()) - .set(OrderPay::getBatteryRent, bAmount); - boolean bOrderRet = orderPayService.update(null, orderPayWrapper); - log.info("更新冻结支付订单结果{}！冻结单号{}", bOrderRet, out_order_no); + LambdaQueryWrapper orderPayWrapper = Wrappers.lambdaQuery(); + orderPayWrapper.eq(OrderPay::getRentOrderId, order.getOrderId()).eq(OrderPay::getPayStatus, PAY_STATUS_NO_PAY).last("limit 1"); + OrderPay orderPay = orderPayService.getOne(orderPayWrapper); + if(null != orderPay){ + orderPay.setBatteryRent(bAmount); + boolean bOrderRet = orderPayService.updateById(orderPay); + log.info("更新冻结支付订单结果{}！冻结单号{}", bOrderRet, out_order_no); + } try { writer = response.getWriter();