From ff981ffffbcf789ced6d0e1caa0132e6034b1b70 Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Wed, 5 Jun 2024 20:27:17 +0800 Subject: [PATCH] fix --- .../gift/service/IPlayGiftInfoService.java | 2 +- .../service/impl/PlayGiftInfoServiceImpl.java | 3 +-- .../weichat/controller/WxGiftController.java | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayGiftInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayGiftInfoService.java index 3fb19af..47de9de 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayGiftInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayGiftInfoService.java @@ -54,7 +54,7 @@ public interface IPlayGiftInfoService extends IService { * @author admin * @since 2024/4/25 15:56 **/ - List customListByAll(String customId,String obtained,String history); + List customListByAll(String customId,String obtained); /** * 查询礼物列表 diff --git a/play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayGiftInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayGiftInfoServiceImpl.java index 2e0dcd8..dd6794d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayGiftInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayGiftInfoServiceImpl.java @@ -57,12 +57,11 @@ public class PlayGiftInfoServiceImpl extends ServiceImpl customListByAll(String customId, String obtained, String history) { + public List customListByAll(String customId, String obtained) { if ("0".equals(obtained)) { //查询所有礼物，然后减去已获得礼物 MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); lambdaWrapper.selectAll(PlayGiftInfoEntity.class); - lambdaWrapper.eq(PlayGiftInfoEntity::getHistory, history); List list = this.baseMapper.selectJoinList(PlayClerkGiftReturnVo.class, lambdaWrapper); List giftInfoEntities = customGiftInfoService.selectBtyCustomId(customId); // 使用迭代器安全地移除元素 diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java index 0993234..16e76f7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java @@ -9,12 +9,13 @@ import com.starry.admin.common.exception.CustomException; import com.starry.admin.modules.gift.service.IPlayGiftInfoService; import com.starry.admin.modules.weichat.entity.PlayGiftInfoDto; import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo; -import com.starry.admin.modules.weichat.entity.gift.PlayCustomGiftQueryVo; import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; @@ -67,9 +68,15 @@ public class WxGiftController { * @return 礼物列表 */ @CustomUserLogin - @PostMapping("/custom/listByAll") - public R customListByAll(@Validated @RequestBody PlayCustomGiftQueryVo vo) { - List list = giftInfoService.customListByAll(ThreadLocalRequestDetail.getCustomUserInfo().getId(), vo.getObtained(), vo.getHistory()); + @GetMapping("/custom/listByAll") + public R customListByAll(@RequestParam("obtained") String obtained) { + if (StrUtil.isBlankIfStr(obtained)) { + throw new CustomException("obtained参数异常"); + } + if (!"0".equals(obtained) && !"1".equals(obtained)) { + throw new CustomException("obtained参数异常"); + } + List list = giftInfoService.customListByAll(ThreadLocalRequestDetail.getCustomUserInfo().getId(), obtained); return R.ok(list); }