From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 10:54:29 +0800
Subject: [PATCH] 云发单对测试用户显示

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 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 962171c..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,6 +71,7 @@
 		UserCloudOrder updateOrder = new UserCloudOrder();
 		updateOrder.setState(true);
 		updateOrder.setId(cloudOrder.getId());
+		updateOrder.setDesc("鎴愬姛寮�閫�" + cloudOrder.getType().getDescShow());
 		updateOrder.setUpdateTime(new Date());
 		userCloudOrderMapper.updateByPrimaryKeySelective(updateOrder);
 		
@@ -113,4 +112,20 @@
 	public List<UserCloudOrder> getLasthourByUnpaid() {
 		return userCloudOrderMapper.getLasthourByUnpaid();
 	}
+	
+	
+	@Override
+	public List<UserCloudOrder> query(int page, int count,String key, Integer state) {
+		return userCloudOrderMapper.query((page-1)* count, count, key, state);
+	}
+	
+	@Override
+	public long count(String key, Integer state) {
+		Long count = userCloudOrderMapper.count(key, state);
+		if (count == null)
+			count = 0L;
+		return count;
+	}
+	
+	
 }

--
Gitblit v1.8.0