diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java index 23b38ca21..92b5695be 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/DiamondGiveHistoryService.java @@ -3,9 +3,12 @@ package com.accompany.business.service.purse; import com.accompany.business.model.DiamondGiveHistory; import com.accompany.business.model.UserPurse; import com.accompany.business.mybatismapper.DiamondGiveHistoryMapper; +import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; +import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.DiamondGiveHistoryVo; +import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; @@ -59,6 +62,8 @@ public class DiamondGiveHistoryService extends ServiceImpl getRecordVos(Long uid, Integer pageSize, Integer pageNum) { if (uid == null) { @@ -95,14 +100,28 @@ public class DiamondGiveHistoryService extends ServiceImpl private void fillSendDiamondSearchVo(List searchVos) { - List recordIds = searchVos.stream().filter(it -> BillObjTypeEnum.SEND_DIAMOND_OUT.getType().equals(it.getObjType())).map(it -> Long.valueOf(it.getObjId())).collect(Collectors.toList()); + List recordIds = searchVos.stream().filter(it -> BillObjTypeEnum.SEND_DIAMOND_OUT.getValue() == it.getObjType()).map(it -> Long.valueOf(it.getObjId())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(recordIds)) { return; } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java index c59f55939..71d4278d5 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java @@ -30,7 +30,6 @@ public class DiamondGiveHistoryController extends BaseController { @ApiOperation("用户转赠记录") @GetMapping("/giveRecord") - @ApiImplicitParam(name = "type", value = "1-别人给我发的邀请,2-我给别人发的邀请", required = true, dataType = "Byte", paramType = "query") public BusiResult> list(@RequestParam(defaultValue = "1")Integer pageNum, @RequestParam(defaultValue = "20")Integer pageSize) { return new BusiResult(diamondGiveHistoryService.getRecordVos(this.getUid(),pageNum,pageSize)); }