moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

奖励配置fixed

Browse Source
This commit is contained in:
hokli
2025-04-18 11:53:08 +08:00
parent b7389e4acb
commit 0cac7490bf
4 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5AwardRecordVo.java
View File

@@ -22,5 +22,6 @@ public class ActivityH5AwardRecordVo extends ActivityH5AwardRecord {
private String name;
private String awardName;
private String awardPic;
private String awardTypeName;
}

2
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5LevelAwardVo.java
View File

@@ -8,4 +8,6 @@ public class ActivityH5LevelAwardVo extends ActivityH5LevelAward {
private String name;
private String awardName;
private String awardPic;
private String awardTypeName;
private String partitionDesc;
}

5
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5AwardRecordServiceImpl.java
View File

@@ -180,6 +180,7 @@ public class ActivityH5AwardRecordServiceImpl extends ServiceImpl<ActivityH5Awar
List<Long> uids = records.stream().map(ActivityH5AwardRecord::getUid).distinct().collect(Collectors.toList());
Map<Long, Users> usersMap = usersService.getUsersMapByUids(uids);
Map<Integer, String> typeNameMap = ActivityType.typeNameMap();
for (ActivityH5AwardRecord record : records) {
ActivityH5AwardRecordVo vo = new ActivityH5AwardRecordVo();
BeanUtils.copyProperties(record, vo);
@@ -194,6 +195,10 @@ public class ActivityH5AwardRecordServiceImpl extends ServiceImpl<ActivityH5Awar
vo.setAwardName(rewardVo.getName());
vo.setAwardPic(rewardVo.getPic());
}
String desc = PartitionEnum.getByPartitionId(record.getPartitionId()).getDesc();
vo.setPartitionDesc(desc);
RewardTypeEnum byRewardType = RewardTypeEnum.getByRewardType(record.getAwardType());
vo.setAwardTypeName(byRewardType.getDesc());
resultList.add(vo);
}
return result;

44
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5LevelAwardServiceImpl.java
View File

@@ -9,33 +9,20 @@ import com.accompany.business.model.activity.h5.ActivityH5LevelAward;
import com.accompany.business.model.dress.ChatBubble;
import com.accompany.business.model.dress.InfoCard;
import com.accompany.business.model.dress.PersonalBackground;
import com.accompany.business.model.dress.UserPersonalBackground;
import com.accompany.business.model.vip.VipInfo;
import com.accompany.business.mybatismapper.NameplateMapper;
import com.accompany.business.mybatismapper.activity.h5.ActivityH5LevelAwardMapper;
import com.accompany.business.param.ActivityH5Param;
import com.accompany.business.service.car.CarGoodsService;
import com.accompany.business.service.car.CarPayService;
import com.accompany.business.service.dress.*;
import com.accompany.business.service.dress.InfoCardService;
import com.accompany.business.service.dress.PersonalBackgroundService;
import com.accompany.business.service.gift.GiftService;
import com.accompany.business.service.headwear.HeadwearService;
import com.accompany.business.service.medal.MedalService;
import com.accompany.business.service.medal.UserMedalService;
import com.accompany.business.service.nameplate.UserNameplateService;
import com.accompany.business.service.purse.UserPurseService;
import com.accompany.business.service.user.UserBackpackService;
import com.accompany.business.service.vip.ChatBubbleService;
import com.accompany.business.service.vip.VipInfoService;
import com.accompany.business.service.vip.VipLevelBizService;
import com.accompany.business.vo.activity.h5.ActivityH5LevelAwardVo;
import com.accompany.common.config.SystemConfig;
import com.accompany.common.constant.Constant;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.core.base.SpringContextHolder;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.exception.AdminServiceException;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.enumeration.PartitionEnum;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,12 +30,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import com.accompany.business.common.constant.RewardTypeEnum;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -64,43 +48,24 @@ import java.util.Map;
public class ActivityH5LevelAwardServiceImpl extends ServiceImpl<ActivityH5LevelAwardMapper, ActivityH5LevelAward> implements ActivityH5LevelAwardService {
@Autowired
private ActivityH5LevelExpService activityH5LevelExpService;
@Autowired
private GiftService giftService;
@Autowired
private UserBackpackService userBackpackService;
@Autowired
private NameplateMapper nameplateMapper;
@Autowired
private UserNameplateService userNameplateService;
@Autowired
private ChatBubbleService chatBubbleService;
@Autowired
private UserChatBubbleService userChatBubbleService;
@Autowired
private HeadwearService headwearService;
@Autowired
private CarGoodsService carGoodsService;
@Autowired
private CarPayService carPayService;
@Autowired
private InfoCardService infoCardService;
@Autowired
private UserInfoCardService userInfoCardService;
@Autowired
private VipInfoService vipInfoService;
@Autowired
@Lazy
private UserPurseService userPurseService;
@Autowired
private MedalService medalService;
@Autowired
private UserMedalService userMedalService;
@Autowired
private PersonalBackgroundService personalBackgroundService;
@Autowired
private UserPersonalBackgroundService userPersonalBackgroundService;
@Override
public IPage<ActivityH5LevelAwardVo> listPage(ActivityH5Param param) {
@@ -138,6 +103,9 @@ public class ActivityH5LevelAwardServiceImpl extends ServiceImpl<ActivityH5Level
activityH5LevelAwardVo.setAwardName(rewardVo.getName());
activityH5LevelAwardVo.setAwardPic(rewardVo.getPic());
}
RewardTypeEnum byRewardType = RewardTypeEnum.getByRewardType(record.getAwardType());
activityH5LevelAwardVo.setAwardTypeName(byRewardType.getDesc());
activityH5LevelAwardVo.setPartitionDesc(PartitionEnum.getByPartitionId(record.getPartitionId()).getDesc());
resultList.add(activityH5LevelAwardVo);
}
}