From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 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 2489804..b6041b9 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,30 +16,30 @@
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.entity.bus.user.HongBao;
+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.service.inter.hongbao.HongBaoService;
+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 org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.tencentcloud.COSManager;
+import com.yeshi.fanli.vo.order.HongBaoV2VO;
@Service
public class UserRankingsServiceImpl implements UserRankingsService {
-
@Resource
private UserRankingsMapper userRankingsMapper;
+
@Resource
- private HongBaoService hongBaoService;
+ private HongBaoV2CountService hongBaoV2CountService;
@Override
public int insertSelective(UserRankings record) throws UserRankingsException {
@@ -63,7 +63,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public int deleteBatchById(Long id) throws UserRankingsException {
return userRankingsMapper.deleteByPrimaryKey(id);
}
@@ -76,7 +76,7 @@
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public int deleteBatchByPrimaryKey(List<Long> arrayID) throws UserRankingsException {
for (Long id : arrayID) {
@@ -135,7 +135,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();
@@ -174,7 +174,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) {
@@ -211,7 +211,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void setStateBatch(List<Long> idList, Integer type, Integer state) throws Exception {
for (Long id : idList) {
@@ -243,7 +243,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void uploadFile(File file) throws Exception {
List<UserRankings> list = new ArrayList<UserRankings>();
@@ -255,7 +255,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);
@@ -279,7 +279,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void updateShowID(File file) throws Exception {
List<String> listID = new ArrayList<String>();
@@ -305,7 +305,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void batchUpNickName(File file) throws Exception {
List<String> listID = new ArrayList<String>();
@@ -369,18 +369,18 @@
String defaultDate = sdf.format(calendar.getTime()); // 鏍煎紡鍖栧墠涓�澶�
// 鐪熷疄鐢ㄦ埛
- List<HongBao> listHongBao = hongBaoService.listShareAndInviteMoney(0, count, defaultDate);
+ List<HongBaoV2VO> listHongBao = hongBaoV2CountService.listShareAndInviteMoney(0, count, defaultDate);
if (listHongBao != null && listHongBao.size() > 0) {
- HongBao hongBao = listHongBao.get(0);
- BigDecimal maxMoney = hongBao.getShareAndInviteMoney();
+ HongBaoV2VO hongBao = listHongBao.get(0);
+ BigDecimal maxMoney = hongBao.getTotalMoney();
UserRankings userRankings = userRankingsList.get(userRankingsList.size() - 1);
BigDecimal mminMoney = userRankings.getTradeReward();
// 鐪熷疄鏁版嵁澶т簬鏈�浣庨噾棰�
if (maxMoney.compareTo(mminMoney) > 0) {
- for (HongBao hb : listHongBao) {
- BigDecimal rewardMoney = hb.getShareAndInviteMoney();
+ for (HongBaoV2VO hb : listHongBao) {
+ BigDecimal rewardMoney = hb.getTotalMoney();
// 濂栭噾楂樺埌浣庢帓搴忥紝涓嶆弧瓒崇粨鏉熷惊鐜�
if (rewardMoney.compareTo(mminMoney) <= 0) {
--
Gitblit v1.8.0