From e3bd1dab9944dd57ea699f5d7514b1b0b29e2bee Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 九月 2024 13:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
index 829204e..2ad2b83 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
@@ -25,8 +25,10 @@
import com.ruoyi.system.api.feignClient.SysUserRoleClient;
import com.ruoyi.system.api.model.GetSysRoleByIds;
import com.ruoyi.system.api.model.SysUserRoleVo;
+import io.seata.core.context.RootContext;
import io.seata.core.exception.TransactionException;
import io.seata.spring.annotation.GlobalTransactional;
+import io.seata.tm.api.GlobalTransaction;
import io.seata.tm.api.GlobalTransactionContext;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
@@ -132,8 +134,6 @@
if(null != one){
return AjaxResult.error("登录账号不能重复");
}
- //添加新数据
- this.save(partner);
//添加登录账户
SysUser user = new SysUser();
user.setPhonenumber(partner.getPhoneOne());
@@ -147,14 +147,11 @@
user.setRoleType(2);
user.setObjectId(partner.getId());
R r = sysUserClient.addSysUser(user);
- if(r.getCode() != 200){
- // 手动进行全局事务回滚
- try {
- GlobalTransactionContext.getCurrent().rollback();
- } catch (TransactionException e) {
- throw new RuntimeException(e);
- }
+ if(200 != r.getCode()){
+ throw new RuntimeException(r.getMsg());
}
+ //添加新数据
+ this.save(partner);
return AjaxResult.success();
}
@@ -242,9 +239,6 @@
}
Partner oldPartner = this.getById(partner.getId());
SysUser user = sysUserClient.queryUserByUserName(oldPartner.getAccount()).getData();
-
- //修改数据
- this.updateById(partner);
//修改登录账户
if(null == user){
user = new SysUser();
@@ -274,6 +268,9 @@
throw new RuntimeException(r.getMsg());
}
}
+
+ //修改数据
+ this.updateById(partner);
return AjaxResult.success();
}
--
Gitblit v1.7.1