From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
index e26ca2d..1cc4d76 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -119,7 +119,7 @@
if (score.compareTo(BigDecimal.ZERO) > 0) {
memberWalletService.add(score, orderInfo.getMemberId(), "score");
- mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+// mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
// 添加业绩
mallAchieveService.add(orderItem.getId());
@@ -131,7 +131,7 @@
MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
if (hasTc) {
if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ mallMember.setLevel(AgentLevelEnum.SECOND_LEVEL.name());
memberMapper.updateById(mallMember);
}
}
@@ -232,7 +232,7 @@
if (score.compareTo(BigDecimal.ZERO) > 0) {
memberWalletService.add(score, orderInfo.getMemberId(), "score");
- mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+// mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
// 添加业绩
mallAchieveService.add(orderItem.getId());
@@ -244,7 +244,7 @@
MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
if (hasTc) {
if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ mallMember.setLevel(AgentLevelEnum.SECOND_LEVEL.name());
memberMapper.updateById(mallMember);
}
}
--
Gitblit v1.9.1