From 9af336a5be2483d67b5dbbf02d87e1e54185014f Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 23 七月 2024 14:52:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java index 111aee9..8a20baa 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java @@ -121,13 +121,12 @@ tIntegralOrder.setState(2); tIntegralOrder.setManageRemark(tIntegralOrder.getRemark()); tIntegralOrder.setRemark(null); - tIntegralOrderService.updateById(tIntegralOrder); - + TIntegralOrder tIntegralOrder1 = tIntegralOrderService.selectById(tIntegralOrder.getId()); new Thread(new Runnable() { @Override public void run() { - TUser tUser = userService.selectById(tIntegralOrder.getUserId()); + TUser tUser = userService.selectById(tIntegralOrder1.getUserId()); if(ToolUtil.isNotEmpty(tUser.getEmail())){ try { Integer language = tUser.getLanguage(); -- Gitblit v1.7.1