diff --git a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java index abf82f0d..6fecddb0 100644 --- a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java +++ b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java @@ -1,5 +1,7 @@ package com.sqx.modules.invite.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,6 +21,7 @@ import com.sqx.modules.invite.entity.InviteAward; import com.sqx.modules.invite.service.InviteAwardService; import com.sqx.modules.invite.service.InviteMoneyService; import com.sqx.modules.invite.service.InviteService; +import com.sqx.modules.orders.service.OrdersService; import com.sqx.modules.sys.entity.SysUserEntity; import com.sqx.modules.sys.entity.SysUserMoneyDetails; import com.sqx.modules.sys.service.SysUserMoneyDetailsService; @@ -27,6 +30,7 @@ import com.sqx.modules.sys.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -61,8 +65,9 @@ public class InviteServiceImpl extends ServiceImpl implements private SysUserService sysUserService; @Autowired private InviteAchievementService inviteAchievementService; - @Autowired - private UserInfoService userInfoService; + @Resource + private OrdersService ordersService; + private final SysUserMoneyDetailsService sysUserMoneyDetailsService; public InviteServiceImpl(SysUserMoneyDetailsService sysUserMoneyDetailsService) { @@ -103,15 +108,20 @@ public class InviteServiceImpl extends ServiceImpl implements List achievementList = inviteAchievementService.list(queryWrapper1); Set achievementUserIds = achievementList.stream().map(InviteAchievement::getTargetUserId).collect(Collectors.toSet()); + int signCount = Integer.parseInt(commonInfoService.findOne(913).getValue()); List jsonList = new ArrayList<>(); + DateTime beginOfDay = DateUtil.beginOfDay(new Date()); + String format = DateUtil.format(beginOfDay, "yyyy-MM-dd HH:mm:ss"); for (UserEntity entity : list) { JSONObject item = new JSONObject(); item.put("userId", entity.getUserId()); item.put("avatar", entity.getAvatar()); item.put("userName", entity.getUserName()); item.put("recordNum", achievementUserIds.contains(entity.getUserId()) ? 1 : 0); - int userTag = userInfoService.getAuthUserTag(entity.getUserId()); - item.put("userTag", userTag); +// int userTag = userInfoService.getAuthUserTag(entity.getUserId()); +// item.put("userTag", userTag); + int count = ordersService.countOrderNum(entity.getUserId(), format); + item.put("userTag", count >= signCount ? 1 : 0); jsonList.add(item); } diff --git a/src/main/resources/mapper/app/UserDao.xml b/src/main/resources/mapper/app/UserDao.xml index 580d6de9..a4314297 100644 --- a/src/main/resources/mapper/app/UserDao.xml +++ b/src/main/resources/mapper/app/UserDao.xml @@ -5,16 +5,11 @@