theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[litemall-admin-api]: 事务管理失败时，返回前台错误信息。

Browse Source
This commit is contained in:
Junling Bu
2018-10-09 15:20:44 +08:00
parent 8dae438d92
commit 118e6226e7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
View File

@@ -16,6 +16,7 @@ import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -133,6 +134,7 @@ public class AdminGoodsController {
} catch (Exception ex) {
txManager.rollback(status);
logger.error("系统内部错误", ex);
return ResponseUtil.fail();
}
txManager.commit(status);
@@ -161,6 +163,7 @@ public class AdminGoodsController {
} catch (Exception ex) {
txManager.rollback(status);
logger.error("系统内部错误", ex);
return ResponseUtil.fail();
}
txManager.commit(status);
return ResponseUtil.ok();
@@ -195,9 +198,11 @@ public class AdminGoodsController {
//将生成的分享图片地址写入数据库
String url = qCodeService.createGoodShareImage(goods.getId().toString(), goods.getPicUrl(), goods.getName());
goods.setShareUrl(url);
if(goodsService.updateById(goods) == 0){
throw new Exception("跟新数据已失效");
if(!StringUtils.isEmpty(url)) {
goods.setShareUrl(url);
if (goodsService.updateById(goods) == 0) {
throw new Exception("跟新数据已失效");
}
}
// 商品规格表litemall_goods_specification
@@ -223,6 +228,7 @@ public class AdminGoodsController {
} catch (Exception ex) {
txManager.rollback(status);
logger.error("系统内部错误", ex);
return ResponseUtil.fail();
}
txManager.commit(status);