From 753defc101f8f308f628fdbb8af6a981a38bdf08 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 28 Jan 2024 22:46:07 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
index baf88ea..cd15ede 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
@@ -18,6 +18,7 @@
import cc.mrbird.febs.vip.service.IVipCommonService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +28,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -58,12 +60,13 @@
name = mallVipBenefits.getName();
}
+ List<String> skuNames = mallOrderInfo.getItems().stream().map(MallOrderItem::getSkuName).collect(Collectors.toList());
double sum = mallOrderInfo.getItems().stream().map(MallOrderItem::getAmount).mapToDouble(BigDecimal::doubleValue).sum();
int score = multiple.multiply(BigDecimal.valueOf(sum)).intValue();
- mallMoneyFlowService.addMoneyFlow(memberId, new BigDecimal(score), ScoreFlowTypeEnum.BUY.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), name, 2);
- mallMemberWalletService.add(new BigDecimal(score), memberId, "prize_score");
+ mallMoneyFlowService.addMoneyFlow(memberId, new BigDecimal(score), ScoreFlowTypeEnum.BUY.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), CollUtil.join(skuNames, ","), 2);
+ mallMemberWalletService.add(new BigDecimal(score), memberId, "prizeScore");
}
@Override
@@ -136,10 +139,12 @@
}
}
- MallMember update = new MallMember();
- update.setId(member.getId());
- update.setLevel(nextLevelCode);
- mallMemberMapper.updateById(update);
+ if (StrUtil.isNotBlank(nextLevelCode)) {
+ MallMember update = new MallMember();
+ update.setId(member.getId());
+ update.setLevel(nextLevelCode);
+ mallMemberMapper.updateById(update);
+ }
}
private Date getStartTime(String type) {
--
Gitblit v1.9.1