diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java index 204ca24ad..bb76b60f5 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java @@ -10,7 +10,7 @@ */ package com.accompany.admin.params; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import lombok.Data; import java.util.List; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RoomAddPersonService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RoomAddPersonService.java index e0e225167..6ed8e7429 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RoomAddPersonService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RoomAddPersonService.java @@ -6,7 +6,6 @@ import com.accompany.core.mybatismapper.RoomMapper; import com.accompany.business.service.ErBanNetEaseService; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.user.UsersBaseService; -import com.accompany.business.service.user.UsersService; import com.google.common.collect.Lists; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java index 5dc1409d6..63aad2d0f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java @@ -29,10 +29,8 @@ import com.accompany.core.model.AccountLoginRecord; import com.accompany.core.model.Users; import com.accompany.core.mybatismapper.UsersMapper; import com.accompany.core.service.account.AccountService; -import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.user.UsersBaseService; -import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.google.gson.Gson; import org.slf4j.Logger; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/LuckySeaActAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/LuckySeaActAdminService.java index f0dd1a655..7c168a565 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/LuckySeaActAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/LuckySeaActAdminService.java @@ -14,7 +14,7 @@ package com.accompany.admin.service.activity; import com.accompany.admin.params.LuckySeaItemSaveReqParams; import com.accompany.admin.vo.luckysea.LuckySeaActPlatformStatVo; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.Map; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java index 1fb8a55db..2350e5eae 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java @@ -18,7 +18,7 @@ import com.accompany.admin.vo.luckysea.LuckySeaActAdminRecordVo; import com.accompany.admin.vo.luckysea.LuckySeaActAdminRoundDetailVo; import com.accompany.admin.vo.luckysea.LuckySeaActAdminUserDrawRecord; import com.accompany.admin.vo.luckysea.LuckySeaActPlatformStatVo; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.accompany.business.service.activities.luckySea.LuckySeaItemService; import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java index 92acf69fd..9ebc4b50b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java @@ -6,7 +6,6 @@ import com.accompany.business.model.Headwear; import com.accompany.business.mybatismapper.activity.LuckySeaActMapper; import com.accompany.business.service.activities.ActNewYearFireworkService; import com.accompany.business.service.activities.valentineCp.ActValentineCpService; -import com.accompany.business.service.activities.vo.LuckySeaRankListVo; import com.accompany.business.service.clan.ClanGoldDayFlowService; import com.accompany.business.service.headwear.HeadwearService; import com.accompany.business.service.push.EnterpriseWechatPushService; @@ -15,7 +14,6 @@ import com.accompany.business.service.room.RoomReciveRankingService; import com.accompany.business.service.room.RoomSendRankingService; import com.accompany.business.service.user.UsersService; import com.accompany.common.config.WebSecurityConfig; -import com.accompany.common.push.MarkdownMessage; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java index dc2b05c09..8a4bef8ce 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java @@ -22,11 +22,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Function; -import java.util.function.Predicate; import java.util.stream.Collectors; /** diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/channel/ChannelContentPartitionAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/channel/ChannelContentPartitionAdminService.java index e523c330b..204b79c22 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/channel/ChannelContentPartitionAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/channel/ChannelContentPartitionAdminService.java @@ -16,7 +16,6 @@ import com.accompany.core.model.Users; import com.accompany.core.model.channel.ChannelContentPartition; import com.accompany.core.model.channel.ChannelContentPartitionExample; import com.accompany.core.mybatismapper.ChannelContentPartitionMapper; -import com.accompany.core.mybatismapper.UsersMapper; import com.accompany.core.service.base.BaseService; import com.accompany.core.service.channel.ChannelContentPartitionService; import com.accompany.core.service.common.JedisService; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/topline/TopLineAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/topline/TopLineAdminService.java index f984ca278..3d982502d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/topline/TopLineAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/topline/TopLineAdminService.java @@ -7,7 +7,6 @@ import com.accompany.admin.mapper.AdminToplineExpand; import com.accompany.core.model.Account; import com.accompany.business.model.TopLine; import com.accompany.business.model.TopLineExample; -import com.accompany.core.mybatismapper.AccountMapper; import com.accompany.business.mybatismapper.TopLineMapper; import com.accompany.business.service.api.QinniuService; import com.accompany.core.service.common.JedisLockService; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/InviteCodeAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/InviteCodeAdminService.java index 18cbc4150..b65870cf9 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/InviteCodeAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/InviteCodeAdminService.java @@ -3,7 +3,6 @@ package com.accompany.admin.service.user; import cn.hutool.core.collection.CollectionUtil; import com.accompany.admin.params.invitecode.AddInviteCodeReqParams; import com.accompany.admin.params.invitecode.InviteCodeQueryParams; -import com.accompany.admin.util.StringUtil; import com.accompany.admin.vo.InviteCodeAdminVo; import com.accompany.admin.vo.PageDataVO; import com.accompany.business.model.UserInviteCode; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java index 99edc4580..209071bb1 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java @@ -14,11 +14,8 @@ import com.accompany.business.util.ReplaceDomainUtil; import com.accompany.business.vo.UserPurseVo; import com.accompany.business.vo.user.CancelUserCheckVo; import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.base.BeanMapper; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Account; import com.accompany.core.model.Users; @@ -26,18 +23,14 @@ import com.accompany.core.model.UsersExample; import com.accompany.core.mybatismapper.UsersMapper; import com.accompany.core.service.SysConfService; import com.accompany.core.service.account.AccountService; -import com.accompany.sms.result.AliyunSmsRet; import com.accompany.sms.service.AliyunSmsService; -import com.aliyuncs.exceptions.ClientException; import com.github.pagehelper.PageInfo; -import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.io.IOException; import java.util.*; /** diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserFrozenAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserFrozenAdminService.java index d57272018..e82c1f3f9 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserFrozenAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserFrozenAdminService.java @@ -9,9 +9,7 @@ import com.accompany.business.model.UserFrozenRecordExample; import com.accompany.business.service.user.UsersService; import com.accompany.common.redis.RedisKey; import com.accompany.core.model.Users; -import com.accompany.core.model.UsersExample; import com.accompany.business.mybatismapper.UserFrozenRecordMapper; -import com.accompany.core.mybatismapper.UsersMapper; import com.accompany.core.service.user.UsersBaseService; import com.accompany.business.util.ReplaceDomainUtil; import com.github.pagehelper.PageHelper; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java index 290ef8962..3945cd303 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java @@ -17,8 +17,8 @@ import com.accompany.admin.util.ExcelUtils; import com.accompany.admin.vo.luckysea.LuckySeaActAdminRoundDetailVo; import com.accompany.admin.vo.luckysea.LuckySeaActAdminUserDrawRecord; import com.accompany.admin.vo.luckysea.LuckySeaActPlatformStatVo; -import com.accompany.business.model.activity.LuckySeaActInfo; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.accompany.business.service.activities.luckySea.ActivitiesLuckySeaService; import com.accompany.business.service.activities.luckySea.LuckySeaActInfoService; import com.accompany.business.service.activities.luckySea.impl.ActivitiesLuckySeaServiceImpl; diff --git a/accompany-admin/accompany-admin-web/src/test/java/servicetest/ClanAdminServiceTest.java b/accompany-admin/accompany-admin-web/src/test/java/servicetest/ClanAdminServiceTest.java index b97dfa4e8..23efd65dd 100644 --- a/accompany-admin/accompany-admin-web/src/test/java/servicetest/ClanAdminServiceTest.java +++ b/accompany-admin/accompany-admin-web/src/test/java/servicetest/ClanAdminServiceTest.java @@ -18,7 +18,6 @@ import com.accompany.business.model.HallMemberAuth; import com.accompany.business.model.HallMemberAuthExample; import com.accompany.business.mybatismapper.HallMemberAuthMapper; import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.clan.ClanFlowIncomeVO; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; diff --git a/accompany-admin/accompany-admin-web/src/test/java/servicetest/HallAdminServiceTest.java b/accompany-admin/accompany-admin-web/src/test/java/servicetest/HallAdminServiceTest.java index 7555be614..a1b7d1dde 100644 --- a/accompany-admin/accompany-admin-web/src/test/java/servicetest/HallAdminServiceTest.java +++ b/accompany-admin/accompany-admin-web/src/test/java/servicetest/HallAdminServiceTest.java @@ -11,21 +11,9 @@ package servicetest; import com.accompany.admin.AdminApplication; -import com.accompany.admin.service.clan.ClanAdminService; import com.accompany.admin.service.hall.HallAdminService; -import com.accompany.admin.vo.clan.ClanAdminInfoVO; -import com.accompany.business.model.HallMemberAuth; -import com.accompany.business.model.HallMemberAuthExample; -import com.accompany.business.mybatismapper.HallMemberAuthMapper; -import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.hall.HallMemberStatisticVo; import com.accompany.business.vo.hall.HallStatisticVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.model.Users; -import com.accompany.core.model.UsersExample; -import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; import org.junit.Assert; @@ -34,7 +22,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.util.CollectionUtils; import java.util.Arrays; import java.util.List; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/mybatis/typehandler/ListTypeHandler.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/mybatis/typehandler/ListTypeHandler.java new file mode 100644 index 000000000..c2743ef0b --- /dev/null +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/mybatis/typehandler/ListTypeHandler.java @@ -0,0 +1,55 @@ +package com.accompany.core.mybatis.typehandler; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; +import org.springframework.util.StringUtils; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by 恒仔 on 2023/3/5. + */ +@Slf4j +@MappedJdbcTypes(JdbcType.VARCHAR) //数据库类型 +@MappedTypes({List.class}) //java数据类型 +public abstract class ListTypeHandler extends BaseTypeHandler> { + @Override + public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException { + String content = StringUtils.isEmpty(parameter) ? null : JSON.toJSONString(parameter); + ps.setString(i, content); + } + @Override + public List getNullableResult(ResultSet rs, String columnName) throws SQLException { + return this.getListByJsonArrayString(rs.getString(columnName)); + } + + @Override + public List getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + return this.getListByJsonArrayString(rs.getString(columnIndex)); + } + + @Override + public List getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + return this.getListByJsonArrayString(cs.getString(columnIndex)); + } + + private List getListByJsonArrayString(String content) { + return StringUtils.isEmpty(content) ? new ArrayList<>() : JSON.parseObject(content, this.specificType()); + } + + /** + * 具体类型，由子类提供 + * @return 具体类型 + */ + protected abstract TypeReference> specificType(); +} \ No newline at end of file diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/mybatis/typehandler/LongListTypeHandler.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/mybatis/typehandler/LongListTypeHandler.java new file mode 100644 index 000000000..01d30b603 --- /dev/null +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/mybatis/typehandler/LongListTypeHandler.java @@ -0,0 +1,16 @@ +package com.accompany.core.mybatis.typehandler; + +import com.alibaba.fastjson.TypeReference; + +import java.util.List; + +/** + * Created by 恒仔 on 2023/3/5. + */ +public class LongListTypeHandler extends ListTypeHandler { + // 将ListTypeHandler（T为任意对象），具体为特定的对象String + @Override + protected TypeReference> specificType() { + return new TypeReference>() {}; + } +} \ No newline at end of file diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/account/TutuAccountService.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/account/TutuAccountService.java index a3f5c4c90..d5686d03b 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/account/TutuAccountService.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/account/TutuAccountService.java @@ -1,8 +1,5 @@ package com.accompany.core.service.account; -import com.accompany.core.model.Account; -import com.accompany.core.model.TutuBindQqLog; -import com.accompany.core.model.TutuBindQqLogExample; import com.accompany.core.model.Account; import com.accompany.core.model.TutuBindQqLog; import com.accompany.core.model.TutuBindQqLogExample; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/phone/impl/AreaInfoServiceImpl.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/phone/impl/AreaInfoServiceImpl.java index c5f0c1888..a1a26c29d 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/phone/impl/AreaInfoServiceImpl.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/phone/impl/AreaInfoServiceImpl.java @@ -3,7 +3,6 @@ package com.accompany.core.service.phone.impl; import cn.hutool.core.map.MapUtil; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; -import com.accompany.core.model.channel.ChannelContentPartition; import com.accompany.core.model.phone.AreaInfo; import com.accompany.core.mybatismapper.AreaInfoMapper; import com.accompany.core.service.common.JedisService; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthApplyRecordServiceImpl.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthApplyRecordServiceImpl.java index 022390d89..049c11a86 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthApplyRecordServiceImpl.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/phone/impl/PhoneAuthApplyRecordServiceImpl.java @@ -22,12 +22,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.ColumnMapRowMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; -import java.util.Objects; /** * 手机授权码注册管理 @@ -39,8 +37,6 @@ import java.util.Objects; @Service public class PhoneAuthApplyRecordServiceImpl extends ServiceImpl implements PhoneAuthApplyRecordService { - @Autowired - private JedisService jedisService; @Autowired private JedisLockService jedisLockService; @Autowired diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaActInfo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaActInfo.java similarity index 71% rename from accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaActInfo.java rename to accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaActInfo.java index 70f1658e7..e4f384d23 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaActInfo.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaActInfo.java @@ -1,16 +1,6 @@ -/* - * 文 件 名: LuckySeaActInfo - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2020/12/30 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.model.activity; +package com.accompany.business.model.activity.luckysea; -import com.baomidou.mybatisplus.annotation.IdType; +import com.accompany.business.mybatis.typehandler.LuckySeaDrawItemListTypeHandler; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** *
类描述: 深海奇缘活动信息 @@ -60,21 +51,13 @@ public class LuckySeaActInfo { @ApiModelProperty("门票数") private Double ticket; - @TableField(value = "draw_id") - @ApiModelProperty("中奖id") - private Long drawId; - - @TableField(value = "draw_multiple") - @ApiModelProperty("中奖倍数") - private Integer drawMultiple; - @TableField(value = "draw_name") - @ApiModelProperty("中间配置名称") + @ApiModelProperty("开奖名称") private String drawName; - @TableField(value = "draw_image_url") - @ApiModelProperty("中间配置图片") - private String drawImageUrl; + @TableField(value = "draw_item_list", typeHandler = LuckySeaDrawItemListTypeHandler.class) + @ApiModelProperty("开奖选项列表") + private List drawItemList; @TableField(value = "create_time") @ApiModelProperty("创建时间") diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaDrawItem.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaDrawItem.java new file mode 100644 index 000000000..3bdd3cd3d --- /dev/null +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaDrawItem.java @@ -0,0 +1,28 @@ +package com.accompany.business.model.activity.luckysea; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class LuckySeaDrawItem { + + @TableField(value = "draw_id") + @ApiModelProperty("中奖id") + private Long drawId; + + @TableField(value = "draw_multiple") + @ApiModelProperty("中奖倍数") + private Integer drawMultiple; + + @TableField(value = "draw_name") + @ApiModelProperty("中间配置名称") + private String drawName; + + @TableField(value = "draw_image_url") + @ApiModelProperty("中间配置图片") + private String drawImageUrl; + +} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaItem.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItem.java similarity index 95% rename from accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaItem.java rename to accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItem.java index 03d78e9fb..b92b20c21 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaItem.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItem.java @@ -8,7 +8,7 @@ * 修改内容: * 修改时间: */ -package com.accompany.business.model.activity; +package com.accompany.business.model.activity.luckysea; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItemGroup.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItemGroup.java new file mode 100644 index 000000000..19545374e --- /dev/null +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaItemGroup.java @@ -0,0 +1,47 @@ +package com.accompany.business.model.activity.luckysea; + +import com.accompany.core.mybatis.typehandler.LongListTypeHandler; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + *
类描述: 深海奇缘活动奖项item + *
功能详细描述: + * + * @author H1 + * @date [2020/12/30] + */ +@Data +@ApiModel +@TableName("lucky_sea_item_group") +public class LuckySeaItemGroup { + + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty("id") + private Long id; + + @TableField(value = "itemIds", typeHandler = LongListTypeHandler.class) + @ApiModelProperty("itemIds") + private List itemIds; + + @TableField("name") + @ApiModelProperty("名称") + private String name; + + @TableField("status") + private Byte status; + + @TableField("create_time") + private Date createTime; + + @TableField("update_time") + private Date updateTime; +} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaRoomTipConfig.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaRoomTipConfig.java similarity index 94% rename from accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaRoomTipConfig.java rename to accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaRoomTipConfig.java index 7ec5d235b..034573ef1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaRoomTipConfig.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaRoomTipConfig.java @@ -1,4 +1,4 @@ -package com.accompany.business.model.activity; +package com.accompany.business.model.activity.luckysea; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaUserDrawRecord.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawRecord.java similarity index 97% rename from accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaUserDrawRecord.java rename to accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawRecord.java index 92e8cef88..d2733355e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaUserDrawRecord.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawRecord.java @@ -8,7 +8,7 @@ * 修改内容: * 修改时间: */ -package com.accompany.business.model.activity; +package com.accompany.business.model.activity.luckysea; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaUserDrawResult.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawResult.java similarity index 81% rename from accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaUserDrawResult.java rename to accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawResult.java index 60642bc84..27058f559 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/LuckySeaUserDrawResult.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/model/activity/luckysea/LuckySeaUserDrawResult.java @@ -1,5 +1,6 @@ -package com.accompany.business.model.activity; +package com.accompany.business.model.activity.luckysea; +import com.accompany.core.mybatis.typehandler.LongListTypeHandler; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -7,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; +import java.util.List; /** *
类描述: 深海奇缘活动用户抽奖结果 @@ -40,8 +42,8 @@ public class LuckySeaUserDrawResult { @TableField(value = "draw_time") private Date drawTime; - @TableField(value = "draw_id") - private Long drawId; + @TableField(value = "draw_id_list", typeHandler = LongListTypeHandler.class) + private List drawIdList; @TableField(value = "draw_status") private Byte drawStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatis/typehandler/LuckySeaDrawItemListTypeHandler.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatis/typehandler/LuckySeaDrawItemListTypeHandler.java new file mode 100644 index 000000000..643ad776c --- /dev/null +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatis/typehandler/LuckySeaDrawItemListTypeHandler.java @@ -0,0 +1,18 @@ +package com.accompany.business.mybatis.typehandler; + +import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; +import com.accompany.core.mybatis.typehandler.ListTypeHandler; +import com.alibaba.fastjson.TypeReference; + +import java.util.List; + +/** + * Created by 恒仔 on 2023/3/5. + */ +public class LuckySeaDrawItemListTypeHandler extends ListTypeHandler { + // 将ListTypeHandler（T为任意对象），具体为特定的对象String + @Override + protected TypeReference> specificType() { + return new TypeReference>() {}; + } +} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActInfoMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActInfoMapper.java index 17998e136..a54b426cf 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActInfoMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaActInfoMapper.java @@ -10,7 +10,7 @@ */ package com.accompany.business.mybatismapper.activity; -import com.accompany.business.model.activity.LuckySeaActInfo; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemGroupMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemGroupMapper.java new file mode 100644 index 000000000..06e1c9858 --- /dev/null +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemGroupMapper.java @@ -0,0 +1,15 @@ +package com.accompany.business.mybatismapper.activity; + +import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *
接口描述: + *
功能详细描述: + * + * @author H1 + * @date [2020/12/31] + */ +public interface LuckySeaItemGroupMapper extends BaseMapper { + +} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemMapper.java index cf5ac9b45..2cbae08e5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaItemMapper.java @@ -10,7 +10,7 @@ */ package com.accompany.business.mybatismapper.activity; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawRecordMapper.java index a1336bfcd..80ba0e4b5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawRecordMapper.java @@ -10,7 +10,7 @@ */ package com.accompany.business.mybatismapper.activity; -import com.accompany.business.model.activity.LuckySeaUserDrawRecord; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawResultMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawResultMapper.java index b30b9daad..f4fadf890 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawResultMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/activity/LuckySeaUserDrawResultMapper.java @@ -10,7 +10,7 @@ */ package com.accompany.business.mybatismapper.activity; -import com.accompany.business.model.activity.LuckySeaUserDrawResult; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/ActivitiesLuckySeaService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/ActivitiesLuckySeaService.java index 66b8417b1..f6f8ca56a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/ActivitiesLuckySeaService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/ActivitiesLuckySeaService.java @@ -1,15 +1,13 @@ package com.accompany.business.service.activities.luckySea; import com.accompany.business.config.LuckySeaActConfig; -import com.accompany.business.model.activity.LuckySeaActInfo; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; import com.accompany.business.service.activities.vo.LuckySeaActUserDrawRecordVo; import com.accompany.business.service.activities.vo.LuckySeaActUserInfo; import com.accompany.business.service.activities.vo.LuckySeaRankVo; import com.accompany.business.vo.activities.LuckySeaActInfoVo; import com.accompany.business.vo.activities.LuckySeaActUserDrawItemVO; -import java.util.Date; import java.util.List; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActInfoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActInfoService.java index de3daa60d..f0758956c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActInfoService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaActInfoService.java @@ -1,7 +1,7 @@ package com.accompany.business.service.activities.luckySea; -import com.accompany.business.model.activity.LuckySeaActInfo; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Date; @@ -31,7 +31,7 @@ public interface LuckySeaActInfoService extends IService { Long addUserStock(String roundId, Long userInput, Double ticket); - boolean updateDrawResult(String roundId, LuckySeaItem item, Date showResultStageStartTime, Double ticket); + boolean updateDrawResult(String roundId, List itemList, Date showResultStageStartTime, Double ticket); long subStock(Long prizePiece); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemGroupService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemGroupService.java new file mode 100644 index 000000000..b41c26862 --- /dev/null +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemGroupService.java @@ -0,0 +1,18 @@ +package com.accompany.business.service.activities.luckySea; + +import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *
接口描述: 深海奇缘活动配置item + *
功能详细描述: + * + * @author H1 + * @date [2020/12/31] + */ +public interface LuckySeaItemGroupService extends IService { + + List listItemGroup(); +} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemService.java index 1e535737e..bd240599e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaItemService.java @@ -1,6 +1,6 @@ package com.accompany.business.service.activities.luckySea; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -16,5 +16,5 @@ public interface LuckySeaItemService extends IService { LuckySeaItem getItemById(Long uid); - List listSingleItem(); + List listItem(); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaSettlementService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaSettlementService.java index 983a4eb53..3fff640fa 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaSettlementService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaSettlementService.java @@ -1,6 +1,6 @@ package com.accompany.business.service.activities.luckySea; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import java.util.List; @@ -8,6 +8,5 @@ public interface LuckySeaSettlementService { void sendReward(String roundId); - void addUserDrawResult(String roundId, List itemList, Long drawId); - + void addUserDrawResult(String roundId, List itemList, List drawIds); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawRecordService.java index 7821a7993..8e2a3703c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawRecordService.java @@ -1,7 +1,7 @@ package com.accompany.business.service.activities.luckySea; -import com.accompany.business.model.activity.LuckySeaItem; -import com.accompany.business.model.activity.LuckySeaUserDrawRecord; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -24,5 +24,5 @@ public interface LuckySeaUserDrawRecordService extends IService listRecordByRoundId(String roundId, Byte status); - boolean updateDrawRecordStatus(String roundId, Long drawId, Byte win); + boolean updateDrawRecordStatus(String roundId, List drawIds, Byte win); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawResultService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawResultService.java index 931775719..9b376427d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawResultService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/LuckySeaUserDrawResultService.java @@ -1,10 +1,8 @@ package com.accompany.business.service.activities.luckySea; -import com.accompany.business.model.activity.LuckySeaUserDrawResult; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - /** *
接口描述: *
功能详细描述: diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/ActivitiesLuckySeaServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/ActivitiesLuckySeaServiceImpl.java index 2a6b8814e..073182b47 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/ActivitiesLuckySeaServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/ActivitiesLuckySeaServiceImpl.java @@ -7,7 +7,10 @@ import com.accompany.business.dto.LuckySeaUserDrawResultDto; import com.accompany.business.enums.UserActPropertyObjType; import com.accompany.business.model.ActivityPack; import com.accompany.business.model.UserPurse; -import com.accompany.business.model.activity.*; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; +import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; import com.accompany.business.mybatismapper.activity.LuckySeaActMapper; import com.accompany.business.service.activities.luckySea.*; import com.accompany.business.service.activities.vo.LuckySeaActUserDrawRecordVo; @@ -207,16 +210,19 @@ public class ActivitiesLuckySeaServiceImpl implements ActivitiesLuckySeaService List userRecords = listUserDrawItemInfo(uid, info.getRoundId()); result.setDrawRecords(userRecords); + Set drawIds = info.getDrawItemList().stream() + .map(LuckySeaDrawItem::getDrawId).collect(Collectors.toSet()); + result.setPrizeDiamonds(0L); if (CollectionUtils.isEmpty(userRecords)){ result.setDrawStatus(Constant.LuckySeaUserStatus.NOT_JOIN); } else { result.setDrawStatus(Constant.LuckySeaUserStatus.NOT_WIN); for (LuckySeaActUserDrawItemVO record: userRecords){ - if (info.getDrawId().equals(record.getId()) && record.getCostPieceNum() > 0) { + if (drawIds.contains(record.getId()) && record.getCostPieceNum() > 0) { result.setDrawStatus(Constant.LuckySeaUserStatus.WIN); - result.setPrizeDiamonds(record.getCostPieceNum().longValue() * record.getMultiple().longValue()); - break; + result.setPrizeDiamonds(result.getPrizeDiamonds() + + record.getCostPieceNum().longValue() * record.getMultiple().longValue()); } } } @@ -275,7 +281,7 @@ public class ActivitiesLuckySeaServiceImpl implements ActivitiesLuckySeaService long reward = 0L; List resultVos = handleDrawResult(result.getResult()); for (LuckySeaUserDrawResultVo resultVo : resultVos) { - if (null != result.getDrawId() && result.getDrawId().equals(resultVo.getItemId())) { + if (result.getDrawIdList().contains(resultVo.getItemId())) { reward += resultVo.getCostPiece() * resultVo.getMultiple(); } } @@ -297,8 +303,7 @@ public class ActivitiesLuckySeaServiceImpl implements ActivitiesLuckySeaService return results; } - List itemList = luckySeaItemService.listSingleItem(); - Map itemUrlMap = itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, LuckySeaItem::getImgUrl)); + Map itemUrlMap = luckySeaItemService.listItem().stream().collect(Collectors.toMap(LuckySeaItem::getId, LuckySeaItem::getImgUrl)); List dtoList = JSON.parseArray(resultJson, LuckySeaUserDrawResultDto.class); for (LuckySeaUserDrawResultDto dto : dtoList) { @@ -315,9 +320,7 @@ public class ActivitiesLuckySeaServiceImpl implements ActivitiesLuckySeaService @Override public List listUserDrawItemInfo(Long uid, String roundId) { - List singleItemList = luckySeaItemService.listSingleItem(); - - Map voMap = singleItemList.stream().map(r->{ + Map voMap = luckySeaItemService.listItem().stream().map(r->{ LuckySeaActUserDrawItemVO vo = new LuckySeaActUserDrawItemVO(); BeanUtils.copyProperties(r, vo); vo.setCostPieceNum(0); @@ -333,7 +336,8 @@ public class ActivitiesLuckySeaServiceImpl implements ActivitiesLuckySeaService } return voMap.values().stream() - .sorted(Comparator.comparing(LuckySeaActUserDrawItemVO::getMultiple)) + .sorted(Comparator.comparing(LuckySeaActUserDrawItemVO::getMultiple) + .thenComparing(LuckySeaActUserDrawItemVO::getId)) .collect(Collectors.toList()); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActInfoServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActInfoServiceImpl.java index 4aaad7835..f69476f86 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActInfoServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaActInfoServiceImpl.java @@ -1,7 +1,8 @@ package com.accompany.business.service.activities.luckySea.impl; -import com.accompany.business.model.activity.LuckySeaActInfo; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; +import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.accompany.business.mybatismapper.activity.LuckySeaActInfoMapper; import com.accompany.business.service.activities.luckySea.LuckySeaActInfoService; import com.accompany.common.constant.Constant; @@ -17,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.redisson.api.RAtomicLong; import org.redisson.api.RBucket; import org.redisson.api.RedissonClient; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,6 +28,7 @@ import java.math.RoundingMode; import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** *
类描述: @@ -142,12 +145,15 @@ public class LuckySeaActInfoServiceImpl extends ServiceImpl itemList, Date showResultStageStartTime, Double ticket) { LuckySeaActInfo db = new LuckySeaActInfo(); db.setRoundId(roundId); - db.setDrawId(item.getId()); - db.setDrawMultiple(item.getMultiple()); - db.setDrawImageUrl(item.getImgUrl()); + List drawItemList = itemList.stream().map(item->{ + LuckySeaDrawItem drawItem = new LuckySeaDrawItem(); + BeanUtils.copyProperties(item, drawItem); + return drawItem; + }).collect(Collectors.toList()); + db.setDrawItemList(drawItemList); db.setStatus(Constant.LuckySeaActStatus.DRAW_OVER); db.setShowResultStageStartTime(showResultStageStartTime); db.setTicket(ticket); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java index e740d2598..8e84cf422 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java @@ -1,9 +1,10 @@ package com.accompany.business.service.activities.luckySea.impl; import com.accompany.business.config.LuckySeaActConfig; -import com.accompany.business.model.activity.LuckySeaActInfo; -import com.accompany.business.model.activity.LuckySeaItem; -import com.accompany.business.model.activity.LuckySeaUserDrawRecord; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; import com.accompany.business.service.LuckySeaPreWarningService; import com.accompany.business.service.activities.luckySea.*; import com.accompany.business.service.purse.UserPurseService; @@ -46,6 +47,8 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { @Autowired private LuckySeaItemService itemService; @Autowired + private LuckySeaItemGroupService itemGroupService; + @Autowired private LuckySeaUserDrawRecordService drawRecordService; @Autowired private LuckySeaSettlementService settlementService; @@ -121,9 +124,6 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { int waitUserDrawTime = timeConfig.getChooseStageTime(); int totalTime = waitUserDrawTime + timeConfig.getWaitingDrawStageTime() + timeConfig.getDrawOverStageTime(); - // todo - List itemList = itemService.listSingleItem(); - String roundId = null; long drawMills = 0L; @@ -177,7 +177,7 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { StopWatch watch = new StopWatch(); watch.start(); - draw(lastLuckySeaActInfo, timeConfig, itemList); + draw(lastLuckySeaActInfo, timeConfig); watch.stop(); drawMills = watch.getTotalTimeMillis(); @@ -214,7 +214,7 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { } } - private void draw(LuckySeaActInfo actInfo, LuckySeaActConfig timeConfig, List itemList) throws InterruptedException { + private void draw(LuckySeaActInfo actInfo, LuckySeaActConfig timeConfig) throws InterruptedException { StopWatch watch = new StopWatch(); watch.start(); @@ -223,7 +223,11 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { throw new ServiceException("活动开奖状态异常"); } - log.info("春日游园活动, 当前开奖的活动信息, actInfo:{} itemList:{}", JSON.toJSONString(actInfo), JSON.toJSONString(itemList)); + List itemList = itemService.listItem(); + List itemGroupList = itemGroupService.listItemGroup(); + + log.info("春日游园活动, 当前开奖的活动信息, actInfo:{} itemList:{} itemGroupList:{}", + JSON.toJSONString(actInfo), JSON.toJSONString(itemList), JSON.toJSONString(itemGroupList)); // 查询当前是否有用户正在进行写入抽奖数据 int retryTimes = 0; @@ -244,13 +248,11 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { Double ticket = BigDecimal.valueOf(userInput).multiply(BigDecimal.valueOf(ticketRate)).doubleValue(); Long stock = actInfoService.addUserStock(roundId, userInput, ticket); - Long drawId = handleDrawPrize(userDrawRecords, itemList, stock); - log.info("春日游园活动,轮次号:{}, 开奖结束，itemId :{}", roundId, drawId); + List drawItems = handleDrawPrize(userDrawRecords, itemList, itemGroupList, stock); + log.info("春日游园活动,轮次号:{}, 开奖结束，drawItems :{}", roundId, drawItems); - LuckySeaItem item = itemList.stream().filter(e->drawId.equals(e.getId())) - .findAny().orElseGet(()->itemService.getItemById(drawId)); - - drawRecordService.updateDrawRecordStatus(roundId, drawId, Constant.LuckySeaUserStatus.WIN); + List drawIds = drawItems.stream().map(LuckySeaItem::getId).collect(Collectors.toList()); + drawRecordService.updateDrawRecordStatus(roundId, drawIds, Constant.LuckySeaUserStatus.WIN); watch.stop(); Long drawMillis = watch.getTotalTimeMillis(); @@ -259,7 +261,7 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { // 更新活动状态 int drawTime = Math.max(timeConfig.getWaitingDrawStageTime() * 1000, drawMillis.intValue()); Date showResultStageStartTime = DateTimeUtil.addMilliSecond(actInfo.getDrawStageStartTime(), drawTime); - if (!actInfoService.updateDrawResult(roundId, item, showResultStageStartTime, ticket)) { + if (!actInfoService.updateDrawResult(roundId, drawItems, showResultStageStartTime, ticket)) { throw new ServiceException("活动开奖状态异常"); } @@ -267,20 +269,49 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { // 异步更新用户抽奖记录 settlementService.sendReward(roundId); - settlementService.addUserDrawResult(roundId, itemList, drawId); + settlementService.addUserDrawResult(roundId, itemList, drawIds); } /** * 处理开奖 + * * @param itemList + * @param itemGroupList * @param stock * @return 开奖的itemId */ - private Long handleDrawPrize(List recordList, List itemList, Long stock) { - Map itemPieceMap = itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, e->0L)); + private List handleDrawPrize(List recordList, + List itemList, + List itemGroupList, + Long stock) { + + //id : List + Map> itemMap = itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, Collections::singletonList)); + itemMap.putAll(itemGroupList.stream().collect(Collectors.toMap(LuckySeaItemGroup::getId, + g->itemList.stream().filter(i->g.getItemIds().contains(i.getId())) + .collect(Collectors.toList())))); + + //itemId : List + Map> idListMap = itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, i->{ + List ids = new ArrayList<>(); + ids.add(i.getId()); + return ids; + })); + for (LuckySeaItemGroup group : itemGroupList){ + for (Long itemId : group.getItemIds()){ + List ids = idListMap.get(itemId); + ids.add(group.getId()); + } + } + + //itemId or groupId: prize + Map itemPieceMap = idListMap.keySet().stream().collect(Collectors.toMap(e->e, e->0L)); for (LuckySeaUserDrawRecord e : recordList) { - Long old = itemPieceMap.getOrDefault(e.getItemId(), 0L); - itemPieceMap.put(e.getItemId(), old + e.getCostPriceNum() * e.getItemMultiple()); + List idList = idListMap.get(e.getItemId()); + for (Long id: idList){ + Long old = itemPieceMap.getOrDefault(id, 0L); + itemPieceMap.put(id, old + e.getCostPriceNum() * e.getItemMultiple()); + } } List lessThanStockItemId = new ArrayList<>(); @@ -308,12 +339,13 @@ public class LuckySeaDrawServiceImpl implements LuckySeaDrawService { drawId = keys.get(index); } + List drawItems = itemMap.get(drawId); // 更新库存 Long prizePiece = itemPieceMap.get(drawId); - log.info("春日游园活动, drawId: {}, prizePiece: {}", drawId, prizePiece); + log.info("春日游园活动, drawId: {}, prizePiece: {}, itemList: {}", drawId, prizePiece, JSON.toJSONString(drawItems)); actInfoService.subStock(prizePiece); - return drawId; + return drawItems; } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemGroupServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemGroupServiceImpl.java new file mode 100644 index 000000000..3dc6e61fe --- /dev/null +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemGroupServiceImpl.java @@ -0,0 +1,32 @@ +package com.accompany.business.service.activities.luckySea.impl; + +import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; +import com.accompany.business.mybatismapper.activity.LuckySeaItemGroupMapper; +import com.accompany.business.service.activities.luckySea.LuckySeaItemGroupService; +import com.accompany.common.constant.Constant; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *
类描述: + *
功能详细描述: + * + * @author H1 + * @date [2020/12/31] + */ +@Service +@Slf4j +public class LuckySeaItemGroupServiceImpl extends ServiceImpl implements LuckySeaItemGroupService { + + @Override + public List listItemGroup() { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().eq(LuckySeaItemGroup::getStatus, Constant.status.valid); + return list(wrapper); + } + +} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemServiceImpl.java index 6a74c3ecb..5a44d8b21 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaItemServiceImpl.java @@ -1,18 +1,13 @@ package com.accompany.business.service.activities.luckySea.impl; -import com.accompany.business.model.activity.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.accompany.business.mybatismapper.activity.LuckySeaItemMapper; import com.accompany.business.service.activities.luckySea.LuckySeaItemService; -import com.accompany.business.util.SpringContextHolder; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.StringUtils; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RBucket; -import org.redisson.api.RList; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.InitializingBean; @@ -50,7 +45,7 @@ public class LuckySeaItemServiceImpl extends ServiceImpl dbList = listSingleItemByDB(); + List dbList = listItemByDB(); if (CollectionUtils.isEmpty(dbList)){ return item; } @@ -64,7 +59,7 @@ public class LuckySeaItemServiceImpl extends ServiceImpl listSingleItem() { + public List listItem() { Collection cacheList = cacheMap.values(); if (!CollectionUtils.isEmpty(cacheList)){ return cacheList.stream() @@ -73,13 +68,12 @@ public class LuckySeaItemServiceImpl extends ServiceImpl listSingleItemByDB() { + private List listItemByDB() { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(LuckySeaItem::getStatus, Constant.status.valid) - .orderByAsc(LuckySeaItem::getMultiple); + wrapper.lambda().eq(LuckySeaItem::getStatus, Constant.status.valid); List itemList = list(wrapper); cacheMap.putAll(itemList.stream().collect(Collectors.toMap(LuckySeaItem::getId, e->e))); cacheMap.expire(CACHE_EXPIRE_SECOND, TimeUnit.SECONDS); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java index 03ffcc3cf..b9e308c58 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java @@ -1,7 +1,7 @@ package com.accompany.business.service.activities.luckySea.impl; -import com.accompany.business.model.activity.LuckySeaRoomTipConfig; -import com.accompany.business.model.activity.LuckySeaUserDrawRecord; +import com.accompany.business.model.activity.luckysea.LuckySeaRoomTipConfig; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; import com.accompany.business.model.firstpage.FirstPageBanner; import com.accompany.business.service.ErBanNetEaseService; import com.accompany.business.service.firstpage.FirstPageBannerService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaSettlementServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaSettlementServiceImpl.java index 4596a207a..390b43f7f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaSettlementServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaSettlementServiceImpl.java @@ -1,9 +1,9 @@ package com.accompany.business.service.activities.luckySea.impl; import com.accompany.business.dto.LuckySeaUserDrawResultDto; -import com.accompany.business.model.activity.LuckySeaItem; -import com.accompany.business.model.activity.LuckySeaUserDrawRecord; -import com.accompany.business.model.activity.LuckySeaUserDrawResult; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; import com.accompany.business.service.activities.luckySea.*; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.record.BillRecordService; @@ -55,7 +55,7 @@ public class LuckySeaSettlementServiceImpl implements LuckySeaSettlementService @Async @Override - public void addUserDrawResult(String roundId, List itemList, Long drawId) { + public void addUserDrawResult(String roundId, List itemList, List drawIds) { List drawUserRecordList = drawRecordService.listRecordByRoundId(roundId, null); if (CollectionUtils.isEmpty(drawUserRecordList)){ return; @@ -89,7 +89,7 @@ public class LuckySeaSettlementServiceImpl implements LuckySeaSettlementService LuckySeaUserDrawResult result = new LuckySeaUserDrawResult(); result.setUid(uid); result.setRoundId(roundId); - result.setDrawId(drawId); + result.setDrawIdList(drawIds); result.setResult(JSON.toJSONString(resultDtoList)); result.setDrawStatus(userDrawStatusMap.get(uid)); result.setDrawTime(now); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawRecordServiceImpl.java index 48383966d..6b68c55e8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawRecordServiceImpl.java @@ -1,7 +1,7 @@ package com.accompany.business.service.activities.luckySea.impl; -import com.accompany.business.model.activity.LuckySeaItem; -import com.accompany.business.model.activity.LuckySeaUserDrawRecord; +import com.accompany.business.model.activity.luckysea.LuckySeaItem; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; import com.accompany.business.mybatismapper.activity.LuckySeaUserDrawRecordMapper; import com.accompany.business.service.activities.luckySea.LuckySeaUserDrawRecordService; import com.accompany.common.constant.Constant; @@ -80,12 +80,13 @@ public class LuckySeaUserDrawRecordServiceImpl extends ServiceImpl drawIds, Byte win) { UpdateWrapper wrapper = Wrappers.update(); wrapper.lambda().eq(LuckySeaUserDrawRecord::getRoundId, roundId) - .eq(LuckySeaUserDrawRecord::getItemId, drawId) + .in(LuckySeaUserDrawRecord::getItemId, drawIds) .set(LuckySeaUserDrawRecord::getDrawStatus, win) .set(LuckySeaUserDrawRecord::getUpdateTime, new Date()); return update(wrapper); } + } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawResultServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawResultServiceImpl.java index 6adb91703..5999fd7b0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawResultServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaUserDrawResultServiceImpl.java @@ -1,6 +1,6 @@ package com.accompany.business.service.activities.luckySea.impl; -import com.accompany.business.model.activity.LuckySeaUserDrawResult; +import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawResult; import com.accompany.business.mybatismapper.activity.LuckySeaUserDrawResultMapper; import com.accompany.business.service.activities.luckySea.LuckySeaUserDrawResultService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserDrawRecordVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserDrawRecordVo.java index 0a33daf44..919ffd6ff 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserDrawRecordVo.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/vo/LuckySeaActUserDrawRecordVo.java @@ -10,10 +10,7 @@ */ package com.accompany.business.service.activities.vo; -import com.accompany.business.model.activity.LuckySeaItem; -import com.accompany.business.model.activity.LuckySeaUserDrawResult; import com.accompany.business.vo.activities.LuckySeaUserDrawResultVo; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -47,15 +44,15 @@ public class LuckySeaActUserDrawRecordVo { @ApiModelProperty(value = "游戏奖励") private Long reward; - @ApiModelProperty(value = "中奖id") - private Long drawId; - - @ApiModelProperty(value = "模式(1:普通模式 2: 礼物模式)") - private Integer itemType; + @ApiModelProperty(value = "中奖ids") + private List drawIdList; @ApiModelProperty(value = "礼物单价") private Long price; + @ApiModelProperty(value = "模式(1:普通模式 2: 礼物模式)") + private Integer itemType; + @ApiModelProperty(value = "礼物名称") private String itemName; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleInfoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleInfoService.java index 06fb8d82d..9b94540f0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleInfoService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleInfoService.java @@ -10,7 +10,6 @@ */ package com.accompany.business.service.callbattle; -import com.accompany.business.model.activity.LuckySeaActInfo; import com.accompany.business.model.callbattle.ActCallBattleInfo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueryService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueryService.java index 67495ae7e..733d45459 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueryService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueryService.java @@ -1,10 +1,7 @@ package com.accompany.business.service.room; import com.accompany.core.model.Room; -import com.accompany.core.mybatismapper.RoomMapper; import com.accompany.core.mybatismapper.RoomMapperExpand; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java index 3c12c5ae3..62c5f8859 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java @@ -11,7 +11,6 @@ import com.accompany.business.event.RoomOpenEvent; import com.accompany.business.event.SuperCloseRoomEvent; import com.accompany.business.event.room.UserAddRoomPasswordEvent; import com.accompany.business.model.*; -import com.accompany.business.model.clan.Clan; import com.accompany.business.model.miniGame.MiniGame; import com.accompany.business.model.miniGame.MiniGameRoom; import com.accompany.business.model.miniGame.MiniGameSwitchRecord; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomTagService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomTagService.java index 7e6191ad0..5c039fe38 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomTagService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomTagService.java @@ -13,8 +13,8 @@ import com.accompany.common.utils.BlankUtil; import com.accompany.core.base.BeanMapper; import com.accompany.core.model.Room; import com.accompany.core.model.Users;; -import com.accompany.core.mybatismapper.RoomMapperExpand; import com.accompany.business.mybatismapper.RoomTagMapper; +import com.accompany.core.mybatismapper.RoomMapperExpand; import com.accompany.core.service.base.BaseService; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java index 96527d06f..9bcde6feb 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java @@ -12,7 +12,6 @@ import com.accompany.common.constant.AppEnum; import com.accompany.common.constant.Constant; import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.CommonUtil; import com.accompany.core.model.Room; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.vo.user.InvitePageVO; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/activities/LuckySeaActInfoVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/activities/LuckySeaActInfoVo.java index bb5a33fe4..c83af9c08 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/activities/LuckySeaActInfoVo.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/activities/LuckySeaActInfoVo.java @@ -10,7 +10,7 @@ */ package com.accompany.business.vo.activities; -import com.accompany.business.model.activity.LuckySeaActInfo; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserDrawItemVO.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserDrawItemVO.java index 1eedda882..ab30ad115 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserDrawItemVO.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/activities/LuckySeaActUserDrawItemVO.java @@ -1,6 +1,5 @@ package com.accompany.business.vo.activities; -import com.accompany.business.model.activity.LuckySeaItem; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleInfoVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleInfoVo.java index 8a799ad32..c141a2bf1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleInfoVo.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/callbattle/ActCallBattleInfoVo.java @@ -10,9 +10,7 @@ */ package com.accompany.business.vo.callbattle; -import com.accompany.business.model.activity.LuckySeaActInfo; import com.accompany.business.model.callbattle.ActCallBattleInfo; -import com.accompany.business.vo.activities.LuckySeaActUserOneRoundDrawResult; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java index 32459fe5b..148991dcb 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java @@ -4,7 +4,7 @@ import com.accompany.business.common.BaseController; import com.accompany.business.config.LuckySeaActConfig; import com.accompany.business.constant.activities.ActivitesPackTypeEnum; import com.accompany.business.model.ActivityPack; -import com.accompany.business.model.activity.LuckySeaActInfo; +import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; import com.accompany.business.service.activities.luckySea.ActivitiesLuckySeaService; import com.accompany.business.service.activities.vo.LuckySeaActUserDrawRecordVo; import com.accompany.business.service.activities.vo.LuckySeaActUserInfo; @@ -13,7 +13,6 @@ import com.accompany.business.service.activity.ActivityPackService; import com.accompany.business.vo.activities.LuckySeaActInfoVo; import com.accompany.business.vo.activities.LuckySeaActUserDrawItemVO; import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; import com.accompany.core.enumeration.BusinessStatusCodeEnum; import com.accompany.core.exception.ServiceException; diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java index 4881323bd..7ac26b19b 100644 --- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java +++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java @@ -16,7 +16,6 @@ import com.accompany.core.mybatismapper.AccountH5LoginRecordMapper; import com.accompany.core.service.account.AccountService; import com.accompany.core.service.common.JedisService; import com.accompany.core.util.JwtUtils; -import com.accompany.oauth2.exception.CustomOAuth2Exception; import com.accompany.sms.service.SmsService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils;