From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index 0ec77c2..640d21b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -37,13 +37,13 @@
import com.yeshi.fanli.entity.admin.UserInfoAdmin;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.InviteUser;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.exception.ThreeSaleException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -90,6 +90,10 @@
@Resource
private ShareMapper shareMapper;
+
+ @Resource
+ private HongBaoV2CountService hongBaoV2CountService;
+
public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {
List<UserInfo> list = null;
@@ -688,23 +692,42 @@
}
// 鏈�鍚庝竴娆′笅鍗曟椂闂�
- Long lastOrderTime = hongBaoService.getLastOrderTime(uid);
+ Date lastOrderTime = hongBaoV2CountService.getLastHongBaoTime(uid);
if (lastOrderTime == null) {
userInfoAdmin.setLastOrderTime(0);
} else {
- userInfoAdmin.setLastOrderTime(lastOrderTime);
+ userInfoAdmin.setLastOrderTime(lastOrderTime.getTime());
}
// 鍘嗗彶鎬昏鍗�
- long totalOrder = hongBaoService.countByUidSelf(uid, null, null);
+ long totalOrder = hongBaoV2CountService.countValidNumberByUid(uid, null);
+
// 浠婃棩鎬昏鍗�
- long todayOrder = hongBaoService.countByUidSelf(uid, 1, null);
+ long todayOrder = hongBaoV2CountService.countValidNumberByUid(uid, 1);
// 鏈湀鎬昏鍗�
- long monthOrder = hongBaoService.countByUidSelf(uid, null, 1);
+ long monthOrder = hongBaoV2CountService.countValidNumberByUid(uid, 2);
userInfoAdmin.setTotalOrder(totalOrder);
userInfoAdmin.setTodayOrder(todayOrder);
userInfoAdmin.setMonthOrder(monthOrder);
+
+
+ // 鏈鍙栫孩鍖� 寰呭叆璐﹂噾棰�
+ BigDecimal unaccountedMoney = hongBaoV2CountService.countWillGetMoneyByUid(uid);
+ if (unaccountedMoney ==null) {
+ unaccountedMoney = new BigDecimal(0);
+ }
+ userInfoAdmin.setUnaccountedMoney(unaccountedMoney.toString());
+
+ // 鍘嗗彶鎬绘敹鐩�
+ BigDecimal totalMoneyHistory = hongBaoV2CountService.countMoneyByUidAndState(uid,3);
+ if (totalMoneyHistory ==null) {
+ totalMoneyHistory = new BigDecimal(0);
+ }
+ userInfoAdmin.setTotalMoneyHistory(totalMoneyHistory.toString());
+
+
+
// 鏀粯瀹濊处鍙� 绱杞处鎬婚噾棰�
double totalMoney = payInfoMapper.sumMoneyByUid(uid);
@@ -712,14 +735,6 @@
// 绱鎻愮幇 (鏆傛湭璁″叆寰俊)
userInfoAdmin.setTotalExtract(totalMoney);
-
- // 鏈鍙栫孩鍖� 寰呭叆璐﹂噾棰�
- double unaccountedMoney = hongBaoService.countForecastMoneysByUid(uid);
- userInfoAdmin.setUnaccountedMoney(unaccountedMoney);
-
- // 鍘嗗彶鎬绘敹鐩�
- double totalMoneyHistory = hongBaoService.countReceiveMoneysByUid(uid);
- userInfoAdmin.setTotalMoneyHistory(totalMoneyHistory);
// 缁熻鍒嗕韩涓暟
long countUserShares = userShareGoodsHistoryMapper.countUserShares(uid);
@@ -797,4 +812,15 @@
return userInfoMapper.longTimeNoLogin(daysNum, list);
}
+ /**
+ * 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴�
+ * @param phone
+ * @param inviteCode
+ * @return
+ */
+ @Override
+ public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode) {
+ return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode);
+ }
+
}
--
Gitblit v1.8.0