gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正支付押金接口

Browse Source
This commit is contained in:
geng.tang@qq.com
2024-01-26 16:52:22 +08:00
parent 2d1f3ed93b
commit 210fa52784
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java
View File

@@ -227,7 +227,8 @@ public class FreezeOrderController extends BaseController {
FreezeOrder one = freezeOrderService.lambdaQuery().eq(FreezeOrder::getNotifyId, notify_id).last("limit 1").one(); FreezeOrder one = freezeOrderService.lambdaQuery().eq(FreezeOrder::getNotifyId, notify_id).last("limit 1").one();
if(one == null) { 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) { if(freezeOrder == null) {
freezeOrder = new FreezeOrder(); freezeOrder = new FreezeOrder();
} }
@@ -253,7 +254,7 @@ public class FreezeOrderController extends BaseController {
.eq(FreezeOrder::getStatus, "INIT") .eq(FreezeOrder::getStatus, "INIT")
.eq(FreezeOrder::getId, freezeOrder.getId()); .eq(FreezeOrder::getId, freezeOrder.getId());
boolean delRet = freezeOrderService.remove(fWrapper); boolean delRet = freezeOrderService.remove(fWrapper);
log.info("删除无效冻结订单{}条！冻结单号{}", delRet, out_order_no); log.info("删除无效冻结订单结果{}！冻结单号{}", delRet, out_order_no);
BigDecimal bAmount = freezeOrder.getAmount(); BigDecimal bAmount = freezeOrder.getAmount();
LambdaQueryWrapper<Order> orderWrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<Order> orderWrapper = Wrappers.lambdaQuery();
@@ -263,11 +264,14 @@ public class FreezeOrderController extends BaseController {
orderService.updateById(order); orderService.updateById(order);
log.info("更新冻结金额！冻结单号{}", out_order_no); log.info("更新冻结金额！冻结单号{}", out_order_no);
LambdaUpdateWrapper<OrderPay> orderPayWrapper = Wrappers.lambdaUpdate(); LambdaQueryWrapper<OrderPay> orderPayWrapper = Wrappers.lambdaQuery();
orderPayWrapper.eq(OrderPay::getRentOrderId, order.getOrderId()) orderPayWrapper.eq(OrderPay::getRentOrderId, order.getOrderId()).eq(OrderPay::getPayStatus, PAY_STATUS_NO_PAY).last("limit 1");
.set(OrderPay::getBatteryRent, bAmount); OrderPay orderPay = orderPayService.getOne(orderPayWrapper);
boolean bOrderRet = orderPayService.update(null, orderPayWrapper); if(null != orderPay){
log.info("更新冻结支付订单结果{}！冻结单号{}", bOrderRet, out_order_no); orderPay.setBatteryRent(bAmount);
boolean bOrderRet = orderPayService.updateById(orderPay);
log.info("更新冻结支付订单结果{}！冻结单号{}", bOrderRet, out_order_no);
}
try { try {
writer = response.getWriter(); writer = response.getWriter();