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/controller/apph5/AppH5UserRankingsController.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
index 51108fa..237c4f5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
@@ -12,21 +12,19 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserRankings;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.user.UserRankingsService;
-import com.yeshi.fanli.util.annotation.RequestNoSignValidate;
+import com.yeshi.fanli.vo.order.HongBaoV2VO;
-import org.yeshi.utils.JsonUtil;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/apph5/v1/rewardRank")
@@ -34,12 +32,11 @@
@Resource
private UserRankingsService userRankingsService;
-
+
@Resource
- private HongBaoService hongBaoService;
-
+ private HongBaoV2CountService hongBaoV2CountService;
/**
- * 杩斿埄鍒告帓琛屾
+ * 鏉挎牀蹇渷鎺掕姒�
* @param callback
* @param out
*/
@@ -78,18 +75,18 @@
String defaultDate = sdf.format(calendar.getTime()); //鏍煎紡鍖栧墠涓�澶�
// 鐪熷疄鐢ㄦ埛
- List<HongBao> listHongBao = hongBaoService.listShareAndInviteMoney(0, 50, defaultDate);
+ List<HongBaoV2VO> listHongBao = hongBaoV2CountService.listShareAndInviteMoney(0, 50, 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