From 26f7accb815f55f18f8eedfca4324700a96884ec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 八月 2020 18:23:49 +0800
Subject: [PATCH] 资金验证优化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java |   50 +++++++++++++++++++++++++++-----------------------
 1 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java
index 9966b15..bcf2e34 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java
@@ -16,19 +16,20 @@
 import java.util.UUID;
 
 import javax.annotation.Resource;
-import javax.transaction.Transactional;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.yeshi.utils.tencentcloud.COSManager;
 
 import com.yeshi.fanli.dao.mybatis.UserRankingsMapper;
-import com.yeshi.fanli.entity.admin.InviteGetMoney;
+import com.yeshi.fanli.dto.money.InviteGetMoney;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserRankings;
-import com.yeshi.fanli.exception.UserRankingsException;
+import com.yeshi.fanli.exception.user.UserRankingsException;
 import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
 import com.yeshi.fanli.service.inter.user.UserRankingsService;
+import com.yeshi.fanli.util.FilePathEnum;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.vo.order.HongBaoV2VO;
 
@@ -62,7 +63,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public int deleteBatchById(Long id) throws UserRankingsException {
 		return userRankingsMapper.deleteByPrimaryKey(id);
 	}
@@ -73,9 +74,15 @@
 		userRankingsMapper.updateClearTradeState();
 	}
 
+	
+	@Override
+	public void clearShareReward() {
+		userRankingsMapper.clearShareReward();
+	}
+	
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public int deleteBatchByPrimaryKey(List<Long> arrayID) throws UserRankingsException {
 		for (Long id : arrayID) {
 
@@ -134,7 +141,7 @@
 		String type = contentType.substring(contentType.indexOf("/") + 1);
 
 		// 涓婁紶鏂囦欢鐩稿浣嶇疆
-		String fileUrl = "userRankings/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+		String fileUrl = FilePathEnum.userRankings.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
 
 		InputStream inputStream = file.getInputStream();
 		String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();
@@ -162,8 +169,7 @@
 	}
 
 	@Override
-	public List<UserRankings> query(long start, int count, String key, Integer tradeState, Integer shareState, Integer sort)
-			throws UserRankingsException {
+	public List<UserRankings> query(long start, int count, String key, Integer tradeState, Integer shareState, Integer sort) {
 		return userRankingsMapper.query(start, count, key, tradeState, shareState, sort);
 	}
 
@@ -173,7 +179,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void setRewardtBatch(List<Long> idList, Integer type, Double reward, Double startReward, Double endReward) throws Exception {
 
 		for (Long id : idList) {
@@ -210,7 +216,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void setStateBatch(List<Long> idList, Integer type, Integer state) throws Exception {
 
 		for (Long id : idList) {
@@ -242,7 +248,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void uploadFile(File file) throws Exception {
 
 		List<UserRankings> list = new ArrayList<UserRankings>();
@@ -254,7 +260,7 @@
 			System.out.println("name" + name);
 			String prefix = name.substring(name.lastIndexOf(".") + 1);
 			// 涓婁紶鏂囦欢鐩稿浣嶇疆
-			String fileUrl = "userRankings/" + UUID.randomUUID().toString().replace("-", "") + "." + prefix;
+			String fileUrl = FilePathEnum.userRankings.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + prefix;
 			System.out.println(fileUrl);
 
 			FileInputStream is = new FileInputStream(filePic);
@@ -278,7 +284,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void updateShowID(File file) throws Exception {
 		List<String> listID = new ArrayList<String>();
 
@@ -304,7 +310,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void batchUpNickName(File file) throws Exception {
 		List<String> listID = new ArrayList<String>();
 
@@ -333,6 +339,13 @@
 	public List<UserRankings> listQueryByIds(List<Long> ids) throws UserRankingsException {
 		return userRankingsMapper.listQueryByIds(ids);
 	}
+	
+
+	@Override
+	public List<UserRankings> getRankList(long start, int count) {
+		return userRankingsMapper.getRankList(start, count);
+	}
+	
 
 	@Override
 	public List<InviteGetMoney> getRank(long start, int count) {
@@ -341,8 +354,6 @@
 		
 		List<InviteGetMoney> rankingsList = new ArrayList<InviteGetMoney>();
 		
-		try {
-
 			 List<UserRankings> userRankingsList = query(0, count, null, 1, null, 2);
 
 			for (UserRankings userRankings : userRankingsList) {
@@ -444,14 +455,7 @@
 				resultList.get(i).setId(n);
 			}
 			
-			
-		} catch (UserRankingsException e) {
-			e.printStackTrace();
-		}
-		
 		return resultList;
-		
-		
 	}
 
 	public List<InviteGetMoney> listSort(List<InviteGetMoney> list) {

--
Gitblit v1.8.0