From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
index 668c9ce..c4095e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
@@ -23,12 +23,14 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.exception.user.ThreeSaleException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
+import com.yeshi.fanli.service.inter.user.invite.TeamFansInfoService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
@@ -73,6 +75,11 @@
@Lazy
@Resource
private IntegralGetService integralGetService;
+
+ @Lazy
+ @Resource
+ private TeamFansInfoService teamFansInfoService;
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -257,21 +264,21 @@
@Override
public JSONObject getMyFirstTeam(long start, int count, Long uid) {
- List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid);
+ List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid, null);
if (list == null) {
list = new ArrayList<ThreeSale>();
}
- long countTotal = threeSaleMapper.countFirstTeam(uid);
+ long countTotal = threeSaleMapper.countFirstTeam(uid, null);
return organizeTeam(countTotal, list);
}
@Override
public JSONObject getMySecondTeam(long start, int count, Long uid) {
- List<ThreeSale> list = threeSaleMapper.listSecondTeam(start, count, uid);
+ List<ThreeSale> list = threeSaleMapper.listSecondTeam(start, count, uid, null);
if (list == null) {
list = new ArrayList<ThreeSale>();
}
- long countTotal = threeSaleMapper.countSecondTeam(uid);
+ long countTotal = threeSaleMapper.countSecondTeam(uid, null);
return organizeTeam(countTotal, list);
}
@@ -426,10 +433,14 @@
*/
@Transactional
private void inviteSuccess(Long workerId, Long bossId) {
+ // 鍚屾绮変笣娑堟伅
+ teamFansInfoService.addFansInfo(workerId, bossId, new Date());
+
if (!Constant.IS_TEST) {
UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(),
UserInviteMQMsg.STATE_SUCCESS);
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess, msg);
+ message.setStartDeliverTime(java.lang.System.currentTimeMillis() + 5000);
producer.send(message);
}
@@ -439,9 +450,10 @@
try { // 閭�璇烽噾甯�
integralGetService.addInviteLevelOne(bossId, workerId);
} catch (Exception e) {
- e.printStackTrace();
+ LogHelper.error(e);
}
-
+
+ // 閭�璇锋垚鍔熸秷鎭�
try {
// 鐩存帴绮変笣閭�璇锋垚鍔�
UserInfo invitee = userInfoService.selectByPKey(workerId);
@@ -456,7 +468,7 @@
boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());
}
} catch (Exception e) {
- e.printStackTrace();
+ LogHelper.error(e);
}
}
});
@@ -490,22 +502,52 @@
@Override
public List<ThreeSale> listFirstTeam(long start, int count, Long uid) {
- return threeSaleMapper.listFirstTeam(start, count, uid);
+ return threeSaleMapper.listFirstTeam(start, count, uid, null);
}
@Override
public List<ThreeSale> listSecondTeam(long start, int count, Long uid) {
- return threeSaleMapper.listSecondTeam(start, count, uid);
+ return threeSaleMapper.listSecondTeam(start, count, uid, null);
+ }
+
+ @Override
+ public List<ThreeSale> listFirstTeam(long start, int count, Long uid, List<Long> listId) {
+ return threeSaleMapper.listFirstTeam(start, count, uid, listId);
+ }
+
+ @Override
+ public List<ThreeSale> listSecondTeam(long start, int count, Long uid, List<Long> listId) {
+ return threeSaleMapper.listSecondTeam(start, count, uid, listId);
}
@Override
public long countFirstTeam(Long uid) {
- return threeSaleMapper.countFirstTeam(uid);
+ return threeSaleMapper.countFirstTeam(uid, null);
}
@Override
public long countSecondTeam(Long uid) {
- return threeSaleMapper.countSecondTeam(uid);
+ return threeSaleMapper.countSecondTeam(uid, null);
+ }
+
+ @Override
+ public long countFirstTeam(Long uid, List<Long> listId) {
+ return threeSaleMapper.countFirstTeam(uid, listId);
+ }
+
+ @Override
+ public long countSecondTeam(Long uid, List<Long> listId) {
+ return threeSaleMapper.countSecondTeam(uid, listId);
+ }
+
+ @Override
+ public long countFirstTeamByDate(Long uid, int dayType) {
+ return threeSaleMapper.countFirstTeamByDate(uid, dayType);
+ }
+
+ @Override
+ public long countSecondTeamByDate(Long uid, int dayType) {
+ return threeSaleMapper.countSecondTeamByDate(uid, dayType);
}
@Override
@@ -565,8 +607,21 @@
}
@Override
- public List<ThreeSale> listAll(int page, int pageSize) {
- return threeSaleMapper.listAll((page-1)*pageSize, pageSize);
+ public List<ThreeSale> listAll(Date minTime, Date maxTime, int page, int pageSize) {
+ return threeSaleMapper.listAll(minTime == null ? null : minTime.getTime(),
+ maxTime == null ? null : maxTime.getTime(), (page - 1) * pageSize, pageSize);
+ }
+
+ @Override
+ public long countAll(Date minTime, Date maxTime) {
+ return threeSaleMapper.countAll(minTime == null ? null : minTime.getTime(),
+ maxTime == null ? null : maxTime.getTime());
+ }
+
+
+ @Override
+ public List<Long> getAllBossId(){
+ return threeSaleMapper.getAllBossId();
}
}
--
Gitblit v1.8.0