From 9582030284d2d1af32e02880accf03ad843e96d6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Jul 2023 14:36:38 +0800
Subject: [PATCH] 支付返利，微信余额支付会有返利。发卷，赠送积分逻辑
---
src/main/java/cc/mrbird/febs/mall/dto/ApiMallRollPerkDto.java | 2 --
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiMallRollPerkDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiMallRollPerkDto.java
index abfc5b2..d86dd6b 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiMallRollPerkDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiMallRollPerkDto.java
@@ -20,6 +20,4 @@
@ApiModelProperty(value = "状态1:未使用 2：已使用", example = "123")
private Integer state;
- @ApiModelProperty(value = "用户ID", example = "123")
- private Long memberId;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 01f55dc..c03ac96 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -831,13 +831,14 @@
@Override
public FebsResponse findMallRollPerkInPage(ApiMallRollPerkDto queryDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
Page<MallRollPerk> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
MallRollPerk mallRollPerk = new MallRollPerk();
if(ObjectUtil.isNotEmpty(queryDto.getState())){
mallRollPerk.setState(queryDto.getState());
}
mallRollPerk.setRollId(queryDto.getRollId());
- mallRollPerk.setMemberId(queryDto.getMemberId());
+ mallRollPerk.setMemberId(memberId);
IPage<MallRollPerk> mallGoodsCommentVoIPage = this.baseMapper.findMallRollPerkInPage(page,mallRollPerk);
return new FebsResponse().success().data(mallGoodsCommentVoIPage);
}
--
Gitblit v1.9.1