From 2886d5a6eee762ad7b776e930fc49b01fb64dd5e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 16 六月 2020 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java | 4 +---
1 files changed, 1 insertions(+), 3 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 c28b2fb..c21727f 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
@@ -8,7 +8,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.user.cloud.UserCloudOrderMapper;
import com.yeshi.fanli.entity.bus.user.cloud.CloudOrderMenuEnum;
@@ -60,7 +59,6 @@
}
- @Transactional(rollbackFor = Exception.class)
@Override
public void cloudPayCloudSuccess(Long orderId) throws UserCloudOrderException{
UserCloudOrder cloudOrder = userCloudOrderMapper.selectForUpdate(orderId);
@@ -73,7 +71,7 @@
UserCloudOrder updateOrder = new UserCloudOrder();
updateOrder.setState(true);
updateOrder.setId(cloudOrder.getId());
- updateOrder.setDesc("鎴愬姛寮�閫� 1涓湀");
+ updateOrder.setDesc("鎴愬姛寮�閫�" + cloudOrder.getType().getDescShow());
updateOrder.setUpdateTime(new Date());
userCloudOrderMapper.updateByPrimaryKeySelective(updateOrder);
--
Gitblit v1.8.0