会员积分问题修复
This commit is contained in:
@@ -30,7 +30,7 @@ public class MemberPointsLogServiceImpl extends ServiceImpl<MemberPointsLogMappe
|
||||
private QueryWrapper buildQueryWrapper(MemberPointsLogDTO param) {
|
||||
QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper();
|
||||
if (ObjUtil.isNotNull(param.getUserId())) {
|
||||
queryWrapper.eq(MemberPointsLog::getUserId, param.getUserId());
|
||||
queryWrapper.eq(MemberPointsLog::getShopUserId, param.getUserId());
|
||||
}
|
||||
if (StrUtil.isNotBlank(param.getNickName())) {
|
||||
queryWrapper.like(ShopUser::getNickName, param.getNickName());
|
||||
|
||||
@@ -196,7 +196,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
|
||||
// 记录积分变动记录
|
||||
MemberPointsLog log = new MemberPointsLog();
|
||||
log.setShopId(entity.getShopId());
|
||||
log.setUserId(entity.getShopUserId());
|
||||
log.setShopUserId(entity.getShopUserId());
|
||||
log.setContent(content);
|
||||
log.setFloatType("subtract");
|
||||
log.setFloatPoints(-points);
|
||||
@@ -221,7 +221,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
|
||||
// 记录积分变动记录
|
||||
MemberPointsLog log = new MemberPointsLog();
|
||||
log.setShopId(entity.getShopId());
|
||||
log.setUserId(entity.getShopUserId());
|
||||
log.setShopUserId(entity.getShopUserId());
|
||||
log.setContent(content);
|
||||
log.setFloatType("add");
|
||||
log.setFloatPoints(points);
|
||||
|
||||
@@ -64,7 +64,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl<PointsExchangeR
|
||||
queryWrapper.eq(PointsExchangeRecord::getStatus, param.getStatus());
|
||||
}
|
||||
if (ObjUtil.isNotNull(param.getUserId())) {
|
||||
queryWrapper.eq(PointsExchangeRecord::getUserId, param.getUserId());
|
||||
queryWrapper.eq(PointsExchangeRecord::getShopUserId, param.getUserId());
|
||||
}
|
||||
if (StrUtil.isNotEmpty(param.getKeywords())) {
|
||||
queryWrapper.and(q -> {
|
||||
@@ -309,7 +309,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl<PointsExchangeR
|
||||
if (goods == null) {
|
||||
throw new CzgException("积分商品不存在");
|
||||
}
|
||||
MemberPoints memberPoints = memberPointsMapper.selectOneById(entity.getUserId());
|
||||
MemberPoints memberPoints = memberPointsMapper.selectOneById(entity.getShopUserId());
|
||||
if (memberPoints == null) {
|
||||
throw new CzgException("会员积分不足无法兑换此商品");
|
||||
}
|
||||
@@ -327,7 +327,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl<PointsExchangeR
|
||||
// 记录积分浮动流水
|
||||
MemberPointsLog log = new MemberPointsLog();
|
||||
log.setShopId(entity.getShopId());
|
||||
log.setUserId(entity.getUserId());
|
||||
log.setShopUserId(entity.getShopUserId());
|
||||
log.setContent(StrUtil.format("兑换商品:{} * {}", entity.getPointsGoodsName(), "1"));
|
||||
log.setFloatType("subtract");
|
||||
log.setFloatPoints(-requiredPoints);
|
||||
@@ -370,7 +370,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl<PointsExchangeR
|
||||
entity.setCancelOrRefundReason(param.getCancelOrRefundReason());
|
||||
entity.setCancelOrRefundTime(LocalDateTime.now());
|
||||
super.updateById(entity);
|
||||
MemberPoints memberPoints = memberPointsMapper.selectOneByQuery(query().eq(MemberPoints::getShopUserId, entity.getUserId()));
|
||||
MemberPoints memberPoints = memberPointsMapper.selectOneByQuery(query().eq(MemberPoints::getShopUserId, entity.getShopUserId()));
|
||||
if (memberPoints == null) {
|
||||
throw new CzgException("会员信息不存在");
|
||||
}
|
||||
@@ -388,7 +388,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl<PointsExchangeR
|
||||
// 记录积分浮动流水
|
||||
MemberPointsLog log = new MemberPointsLog();
|
||||
log.setShopId(entity.getShopId());
|
||||
log.setUserId(entity.getUserId());
|
||||
log.setShopUserId(entity.getShopUserId());
|
||||
log.setContent(StrUtil.format("(退单)兑换商品:{} * {}", entity.getPointsGoodsName(), "1"));
|
||||
log.setFloatType("add");
|
||||
log.setFloatPoints(+entity.getSpendPoints());
|
||||
|
||||
Reference in New Issue
Block a user