From 63d7d733938c8ea2fbb046625f1f70d6c48f8673 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 14 十二月 2019 11:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index 259d793..bb0886a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -440,7 +440,17 @@
}
vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid));
- // 浼氬憳瑙勫垯鎵ц鏃堕棿
+
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(BanLiShopOrder.STATE_SUCCESS);
+ BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
+
+ vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString()));
+ vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));
+ vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
+
+
+ // 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
Date executeDate = null;
try {
@@ -449,14 +459,6 @@
} catch (ParseException e) {
e.printStackTrace();
}
- List<Integer> list = new ArrayList<Integer>();
- list.add(BanLiShopOrder.STATE_SUCCESS);
- BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
-
- vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString()));
- vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney));
- vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
-
UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
if (extra != null
&& (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {
@@ -513,7 +515,18 @@
// 鐪侀挶 -鑷喘浜х敓杩斿埄
- // 浼氬憳瑙勫垯鎵ц鏃堕棿
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(BanLiShopOrder.STATE_SUCCESS);
+ BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
+
+ BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);
+ long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);
+ long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);
+ BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);
+
+ long limitTeam = 0;
+
+ // 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
Date executeDate = null;
try {
@@ -522,17 +535,7 @@
} catch (ParseException e) {
e.printStackTrace();
}
- List<Integer> list = new ArrayList<Integer>();
- list.add(BanLiShopOrder.STATE_SUCCESS);
- BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
-
- BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);
- long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney);
- long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);
- BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);
-
- long limitTeam = 0;
-
+
UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
if (extra != null
&& (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {
--
Gitblit v1.8.0