From 8cdc3dd26352cd1956f6956ae0fb60c7c232123d Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 26 Jan 2026 10:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finance/common/controller/PaymentController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zmzm/finance/common/controller/PaymentController.java b/src/main/java/com/zmzm/finance/common/controller/PaymentController.java index 27a19ef..98f2270 100644 --- a/src/main/java/com/zmzm/finance/common/controller/PaymentController.java +++ b/src/main/java/com/zmzm/finance/common/controller/PaymentController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -140,7 +141,7 @@ public class PaymentController { .notExists("select 1 from payment_to_order where order_id = orders.id and state = 0") .eq(Orders::getFee, payment.getFee()) .eq(Orders::getPayType, 0) - .ge(Orders::getOrderTime, DateUtils.addDays(payment.getCtime(),-1)) + .ge(Orders::getOrderTime, payment.getCtime()) .le(Orders::getOrderTime, DateUtils.addDays(payment.getCtime(),3)) .orderByAsc(Orders::getOrderTime)); return R.ok().put("data",ordersList); @@ -154,7 +155,13 @@ public class PaymentController { paymentService.updateById(payment); paymentToOrderService.save(pto); ordersService.updatePoint(pto.getOrderId()); - ordersService.update(new LambdaUpdateWrapper().set(Orders::getUseFlag,1).eq(Orders::getId,pto.getOrderId())); + Orders orders = ordersService.getById(pto.getOrderId()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + if(!sdf.format(payment.getCtime()).equals(sdf.format(orders.getOrderTime()))){ + orders.setOrderTime(payment.getCtime()); + } + orders.setUseFlag(1); + ordersService.updateById(orders); return R.ok(); }