From 78f3f67d4629583b5ed5bf7ac8552344f0403ced Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 17:29:36 +0800
Subject: [PATCH] 金币获取拦截修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 02e2aba..7eb4df4 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,27 +16,29 @@
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.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.user.UserRankingsService;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.vo.order.HongBaoV2VO;
@Service
public class UserRankingsServiceImpl implements UserRankingsService {
-
@Resource
private UserRankingsMapper userRankingsMapper;
-
+
+ @Resource
+ private HongBaoV2CountService hongBaoV2CountService;
@Override
public int insertSelective(UserRankings record) throws UserRankingsException {
@@ -366,18 +368,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