From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleDetailSerivceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleDetailSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleDetailSerivceImpl.java
index 1af89ce..920c142 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleDetailSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleDetailSerivceImpl.java
@@ -11,6 +11,7 @@
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.ThreeSaleDetail;
import com.yeshi.fanli.exception.ParamsException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
@@ -33,8 +34,8 @@
detail.setId(id);
// 鏍规嵁涓婚敭鏌ヨ
ThreeSaleDetail old = threeSaleDetailDao.get(id);
- if (old == null)
- threeSaleDetailDao.save(detail);
+ // if (old == null)
+ threeSaleDetailDao.save(detail);
}
@Override
@@ -60,17 +61,22 @@
@Override
public void addByWorkerUid(Long workerUid) {
List<ThreeSale> list = threeSaleSerivce.getMyBossDeepList(workerUid, 100);
+ LogHelper.teamInfo(String.format("閭�璇疯缁嗕俊鎭�: 鐢ㄦ埛ID:%s 涓婄骇鏁伴噺:%s", workerUid + "", list.size()));
int level = 0;
+ long createTime = 0L;
+ if (list.size() > 0) {
+ if (list.get(0).getSucceedTime() != null)
+ createTime = list.get(0).getSucceedTime();
+ else
+ createTime = list.get(0).getCreateTime();
+ }
for (ThreeSale tts : list) {
level++;
ThreeSaleDetail detail = new ThreeSaleDetail();
detail.setBossUid(tts.getBoss().getId());
detail.setLevel(level);
detail.setWorkerUid(workerUid);
- if (tts.getSucceedTime() != null)
- detail.setCreateTime(new Date(tts.getSucceedTime()));
- else
- detail.setCreateTime(new Date(tts.getCreateTime()));
+ detail.setCreateTime(new Date(createTime));
try {
if (tts.getState())
addThreeSaleDetail(detail);
@@ -85,4 +91,9 @@
return threeSaleDetailDao.listByWorkerUid(uid);
}
+ @Override
+ public ThreeSaleDetail getByBossUidAndWorkerUid(Long bossUid, Long workerUid) {
+ String id = bossUid + "#" + workerUid;
+ return threeSaleDetailDao.get(id);
+ }
}
--
Gitblit v1.8.0