From 822e2bc06f9e95f357867d457c004e7bb1f67db8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 16:27:15 +0800
Subject: [PATCH] 签到通知
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 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..0316022 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,11 +18,12 @@
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.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
@@ -66,6 +67,14 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -345,7 +354,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 +365,7 @@
long countTotal = threeSaleMapper.countFirstTeam(uid, state);
- return organizeTeam(countTotal, list, uid);
+ return organizeTeam(countTotal, list);
}
@Override
@@ -368,10 +377,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();
@@ -402,18 +411,15 @@
object.put("memoName", memoName);
String nickName = "";
- Long workerId= null;
String portrait = "";
Long lastLoginTime = null;
UserInfo worker = threeSale.getWorker();
if (worker != null) {
- workerId = worker.getId();
portrait = worker.getPortrait();
lastLoginTime = worker.getLastLoginTime();
nickName = worker.getNickName();
}
- object.put("workerId", workerId);
object.put("nickName", nickName);
object.put("portrait", portrait);
@@ -438,15 +444,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 +489,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);
@@ -514,7 +508,7 @@
@Override
@Transactional
- public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter, String platform, String version) throws ThreeSaleException {
+ public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException {
if (invitee == null || inviter == null)
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -524,6 +518,8 @@
if (threeSale != null) {
// 鏈夋晥鍏崇郴--鐢熸晥
+ threeSale.setBoss(inviter);
+ threeSale.setWorker(invitee);
threeSale.setState(true);
threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);
threeSale.setSucceedTime(java.lang.System.currentTimeMillis());
@@ -561,8 +557,9 @@
executor.execute(new Runnable() {
@Override
public void run() {
+
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(inviter.getId());
try {
- UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(inviter.getId());
if (activeLog != null && !StringUtil.isNullOrEmpty(activeLog.getVersionCode()) ) {
String versionCode = activeLog.getVersionCode();
String channel = activeLog.getChannel();
@@ -591,6 +588,9 @@
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
+
+ // 閭�璇烽噾甯�
+ integralGetService.addInviteLevelOne(inviter.getId(), invitee.getId());
}
});
@@ -599,7 +599,7 @@
@Override
@Transactional
- public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld, String platform, String version) throws ThreeSaleException {
+ public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException {
if (invitee == null || (inviterId == null && threeSaleOld == null))
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -642,6 +642,7 @@
UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
threeSale.setBoss(boss);
+ threeSale.setWorker(invitee);
// 娣诲姞鍒伴槦鍒�
ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);
@@ -714,5 +715,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