irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
admin
2024-06-05 20:27:17 +08:00
parent 5e538a1b1e
commit ff981ffffb
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayGiftInfoService.java
View File

@@ -54,7 +54,7 @@ public interface IPlayGiftInfoService extends IService<PlayGiftInfoEntity> {
* @author admin * @author admin
* @since 2024/4/25 15:56 * @since 2024/4/25 15:56
**/ **/
List<PlayClerkGiftReturnVo> customListByAll(String customId,String obtained,String history); List<PlayClerkGiftReturnVo> customListByAll(String customId,String obtained);
/** /**
* 查询礼物列表 * 查询礼物列表

3
play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayGiftInfoServiceImpl.java
View File

@@ -57,12 +57,11 @@ public class PlayGiftInfoServiceImpl extends ServiceImpl<PlayGiftInfoMapper, Pla
@Override @Override
public List<PlayClerkGiftReturnVo> customListByAll(String customId, String obtained, String history) { public List<PlayClerkGiftReturnVo> customListByAll(String customId, String obtained) {
if ("0".equals(obtained)) { if ("0".equals(obtained)) {
//查询所有礼物，然后减去已获得礼物 //查询所有礼物，然后减去已获得礼物
MPJLambdaWrapper<PlayGiftInfoEntity> lambdaWrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<PlayGiftInfoEntity> lambdaWrapper = new MPJLambdaWrapper<>();
lambdaWrapper.selectAll(PlayGiftInfoEntity.class); lambdaWrapper.selectAll(PlayGiftInfoEntity.class);
lambdaWrapper.eq(PlayGiftInfoEntity::getHistory, history);
List<PlayClerkGiftReturnVo> list = this.baseMapper.selectJoinList(PlayClerkGiftReturnVo.class, lambdaWrapper); List<PlayClerkGiftReturnVo> list = this.baseMapper.selectJoinList(PlayClerkGiftReturnVo.class, lambdaWrapper);
List<PlayCustomGiftInfoEntity> giftInfoEntities = customGiftInfoService.selectBtyCustomId(customId); List<PlayCustomGiftInfoEntity> giftInfoEntities = customGiftInfoService.selectBtyCustomId(customId);
// 使用迭代器安全地移除元素 // 使用迭代器安全地移除元素

19
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java
View File

@@ -9,12 +9,13 @@ import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.gift.service.IPlayGiftInfoService; import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
import com.starry.admin.modules.weichat.entity.PlayGiftInfoDto; 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.PlayClerkGiftReturnVo;
import com.starry.admin.modules.weichat.entity.gift.PlayCustomGiftQueryVo;
import com.starry.common.result.R; import com.starry.common.result.R;
import com.starry.common.utils.ConvertUtil; import com.starry.common.utils.ConvertUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.*; 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 javax.annotation.Resource;
import java.util.List; import java.util.List;
@@ -67,9 +68,15 @@ public class WxGiftController {
* @return 礼物列表 * @return 礼物列表
*/ */
@CustomUserLogin @CustomUserLogin
@PostMapping("/custom/listByAll") @GetMapping("/custom/listByAll")
public R customListByAll(@Validated @RequestBody PlayCustomGiftQueryVo vo) { public R customListByAll(@RequestParam("obtained") String obtained) {
List<PlayClerkGiftReturnVo> list = giftInfoService.customListByAll(ThreadLocalRequestDetail.getCustomUserInfo().getId(), vo.getObtained(), vo.getHistory()); if (StrUtil.isBlankIfStr(obtained)) {
throw new CustomException("obtained参数异常");
}
if (!"0".equals(obtained) && !"1".equals(obtained)) {
throw new CustomException("obtained参数异常");
}
List<PlayClerkGiftReturnVo> list = giftInfoService.customListByAll(ThreadLocalRequestDetail.getCustomUserInfo().getId(), obtained);
return R.ok(list); return R.ok(list);
} }