From 6a47350594a4843f6cc36e5c94902d6fa97a6d4a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java
index bbc7365..1454a66 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java
@@ -60,7 +60,6 @@
 	}
 	
 	
-	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void cloudPayCloudSuccess(Long orderId) throws UserCloudOrderException{
 		UserCloudOrder cloudOrder = userCloudOrderMapper.selectForUpdate(orderId);
@@ -73,6 +72,7 @@
 		UserCloudOrder updateOrder = new UserCloudOrder();
 		updateOrder.setState(true);
 		updateOrder.setId(cloudOrder.getId());
+		updateOrder.setDesc("鎴愬姛寮�閫�" + cloudOrder.getType().getDescShow());
 		updateOrder.setUpdateTime(new Date());
 		userCloudOrderMapper.updateByPrimaryKeySelective(updateOrder);
 		

--
Gitblit v1.8.0