From aed9a0f76ba9c181b375c96f5091fc0ee07413c3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 14 Aug 2023 10:53:30 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 0c8ee20..88883a8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -241,7 +241,7 @@
@Override
public void addMemberScan(String str) {
- String[] split = StrUtil.split(str, "-");
+ String[] split = StrUtil.split(str, "@");
String referrerId = split[0];
String openId = split[1];
MallMember mallMember = memberMapper.selectMemberByOpenId(openId);
@@ -377,9 +377,18 @@
String returnPercentStr = StrUtil.isNotEmpty(returnPercentDic.getValue()) ? "1" : returnPercentDic.getValue();
BigDecimal returnPercent = new BigDecimal(returnPercentStr).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN);
BigDecimal amountActual = amountBigDecimal.multiply(returnPercent).setScale(2, BigDecimal.ROUND_DOWN);
- memberWalletService.add(amountActual, id, "balance");
- mallMoneyFlowService.addMoneyFlow(id, amountActual, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(),
- mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+
+ mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ amountActual,
+ MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(),
+ mallOrderInfo.getOrderNo(),
+ "直推奖",
+ "直推奖",
+ id,
+ 1,
+ FlowTypeEnum.BALANCE.getValue(),
+ 2);
}
}
for(MallOrderItem mallOrderItem : mallOrderItemList){
@@ -388,7 +397,7 @@
if(ObjectUtil.isEmpty(mallGoods)){
break;
}
- if(1 == mallGoods.getIsUnreal()){
+ if(ObjectUtil.isNotEmpty(mallGoods.getIsUnreal()) && 1 == mallGoods.getIsUnreal()){
mallOrderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
mallOrderInfoMapper.updateById(mallOrderInfo);
}
@@ -407,7 +416,7 @@
memberWalletService.add(levelOnePrice, memberId, "score");
mallMoneyFlowService.addMoneyFlow(memberId, levelOnePrice, MoneyFlowTypeEnum.STATIC_BONUS.getValue(),
- mallOrderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+ mallOrderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"赠送积分",2);
}
}
}
@@ -444,7 +453,9 @@
mallMemberClass.setOrderId(orderId);
mallMemberClass.setClassName(goodsName);
mallMemberClass.setClassPic(skuImage);
+ mallMemberClass.setClassDec(mallGoods.getGoodsIntrodution());
mallMemberClass.setClassUrl(mallGoods.getVideoUrl());
+ mallMemberClass.setCreateTime(DateUtil.date());
mallMemberClassMapper.insert(mallMemberClass);
return;
}else if(5 == isNormal){
--
Gitblit v1.9.1