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

日常任务改版

Browse Source
This commit is contained in:
hokli
2025-08-25 18:33:55 +08:00
parent 4c274489d4
commit a565d0803d
40 changed files with 796 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/packcenter/PackInfoAdminService.java
View File

@@ -109,7 +109,7 @@ public class PackInfoAdminService {
private PackAwardVo coverAwardVo(ActivityH5LevelAward award, Map<Long, PackItem> awardItemMap) {
PackAwardVo awardVo = new PackAwardVo();
awardVo.setAwardId(award.getId());
RewardVo rewardVo = activityH5LevelAwardService.coverRewardByType(award.getAwardType(), award.getAwardId().intValue());
RewardVo rewardVo = activityH5LevelAwardService.coverAdminRewardByType(award.getAwardType(), award.getAwardId().intValue());
if (rewardVo != null) {
awardVo.setAwardName(rewardVo.getName());
awardVo.setAwardPic(rewardVo.getPic());

6
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityH5LevelAwardController.java
View File

@@ -1,7 +1,6 @@
package com.accompany.admin.controller.activity;
import com.accompany.business.common.vo.RewardVo;
import com.accompany.business.constant.activity.ActivityType;
import com.accompany.business.model.activity.h5.ActivityH5LevelAward;
import com.accompany.business.param.ActivityH5Param;
import com.accompany.business.service.activity.h5.ActivityH5LevelAwardService;
@@ -10,16 +9,13 @@ import com.accompany.common.result.BusiResult;
import com.accompany.core.exception.AdminServiceException;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* <p>
@@ -45,7 +41,7 @@ public class ActivityH5LevelAwardController {
@ApiOperation(value = "保存",httpMethod = "POST")
@PostMapping("/save")
public BusiResult<Void> save(ActivityH5LevelAward activityH5LevelAward) {
RewardVo rewardVo = activityH5LevelAwardService.coverRewardByType(activityH5LevelAward.getAwardType(), activityH5LevelAward.getAwardId().intValue());
RewardVo rewardVo = activityH5LevelAwardService.coverAdminRewardByType(activityH5LevelAward.getAwardType(), activityH5LevelAward.getAwardId().intValue());
if (rewardVo == null) {
throw new AdminServiceException("奖励不存在");
}