From 14a3571e8cbd885d9d47ffdb4da14287d32a0718 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 12 八月 2019 11:09:44 +0800
Subject: [PATCH] 队员列表 邀请码、微信绑定验证
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index de660c3..303414d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -18,10 +18,10 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.exception.ThreeSaleException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
@@ -66,6 +66,10 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -345,7 +349,7 @@
public List<ThreeSale> listbyIdAndBossId(Long id, Long uid, Integer expire) {
return threeSaleMapper.listbyIdAndBossId(id, uid, expire);
}
-
+
@Override
public JSONObject getMyFirstTeam(long start, int count, Long uid, Integer state) {
@@ -356,7 +360,7 @@
long countTotal = threeSaleMapper.countFirstTeam(uid, state);
- return organizeTeam(countTotal, list, uid);
+ return organizeTeam(countTotal, list);
}
@Override
@@ -368,10 +372,10 @@
long countTotal = threeSaleMapper.countSecondTeam(uid, state);
- return organizeTeam(countTotal, list, uid);
+ return organizeTeam(countTotal, list);
}
- public JSONObject organizeTeam(long count, List<ThreeSale> list, Long uid) {
+ public JSONObject organizeTeam(long count, List<ThreeSale> list) {
JSONObject result = new JSONObject();
@@ -413,7 +417,6 @@
lastLoginTime = worker.getLastLoginTime();
nickName = worker.getNickName();
}
- object.put("workerId", workerId);
object.put("nickName", nickName);
object.put("portrait", portrait);
@@ -438,15 +441,8 @@
// 寰�骞�
contentJson.put("content", "鏈�杩戠櫥褰� " + format.format(lastLoginTime));
}
+
array.add(contentJson);
-
-
- if (workerId != null) {
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(workerId);
- if (userInfoExtra != null)
- object.put("weiXin", userInfoExtra.getWeiXin());
- }
-
} else if (threeSale.getExpire() != null
&& (threeSale.getExpire() == 1 || threeSale.getExpire().equals(1))) {
@@ -490,18 +486,13 @@
resultArray.add(object);
}
- boolean bdWeiXin = false;
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
- bdWeiXin = true;
-
- result.put("bdWeiXin", bdWeiXin);
result.put("count", count);
result.put("result_list", resultArray);
return result;
}
-
+
+
@Override
public List<ThreeSale> listByWorkerId(Long workerId) {
return threeSaleMapper.listByWorkerId(workerId);
@@ -714,5 +705,16 @@
public List<ThreeSale> getSuccessByDate(Long bossId, Long minTime, Long maxTime){
return threeSaleMapper.getSuccessByDate(bossId, minTime, maxTime);
}
+
+
+ @Override
+ public List<ThreeSale> listFirstTeam(long start, int count, Long uid, Integer state) {
+ return threeSaleMapper.listFirstTeam(start, count, uid, state);
+ }
+
+ @Override
+ public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state) {
+ return threeSaleMapper.listSecondTeam(start, count, uid, state);
+ }
}
--
Gitblit v1.8.0