From 700cbb19a285e639bb05404503efa3da9988c083 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 21 七月 2026 22:53:55 +0800
Subject: [PATCH] 分账可开关

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index 44d164b..2009a50 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -141,9 +141,18 @@
     @PostMapping("/callBack")
     public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){
         TVipOrder one = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, code).one();
-        one.setSerialNumber(outTradeNo);
-        one.setPaymentStatus(2);
-        vipOrderService.updateById(one);
+        if (one == null) {
+            return R.fail("会员订单不存在");
+        }
+        boolean updated = vipOrderService.update(new LambdaUpdateWrapper<TVipOrder>()
+                .eq(TVipOrder::getId, one.getId())
+                .eq(TVipOrder::getPaymentStatus, 1)
+                .set(TVipOrder::getSerialNumber, outTradeNo)
+                .set(TVipOrder::getPaymentStatus, 2)
+                .set(TVipOrder::getPayTime, LocalDateTime.now()));
+        if (!updated) {
+            return R.ok();
+        }
         GiveVipDto giveVipDto = new GiveVipDto();
         giveVipDto.setVipId(one.getVipId());
         giveVipDto.setType(one.getVipType());

--
Gitblit v1.7.1