From 93dd377310eeec4389c6a0f786dd498bdb28cffc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Jul 2023 16:19:29 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 17 +++++++++++------
1 files changed, 11 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 d76f35a..5092660 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);
@@ -388,6 +388,10 @@
if(ObjectUtil.isEmpty(mallGoods)){
break;
}
+ if(ObjectUtil.isNotEmpty(mallGoods.getIsUnreal()) && 1 == mallGoods.getIsUnreal()){
+ mallOrderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+ }
//是否送券 1:是 2:否
BigDecimal levelTwoPrice = mallGoods.getLevelTwoPrice();
if(BigDecimal.ONE.compareTo(levelTwoPrice) == 0){
@@ -396,8 +400,6 @@
mallRollPerk.setState(1);
mallRollPerk.setRollId(mallGoods.getLevelThreePrice().longValue());
mallRollPerkMapper.insert(mallRollPerk);
- mallOrderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
- mallOrderInfoMapper.updateById(mallOrderInfo);
}
//赠送积分
BigDecimal levelOnePrice = mallGoods.getLevelOnePrice();
@@ -405,7 +407,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);
}
}
}
@@ -442,13 +444,15 @@
mallMemberClass.setOrderId(orderId);
mallMemberClass.setClassName(goodsName);
mallMemberClass.setClassPic(skuImage);
- mallMemberClass.setClassUrl(skuImage);
+ mallMemberClass.setClassDec(mallGoods.getGoodsIntrodution());
+ mallMemberClass.setClassUrl(mallGoods.getVideoUrl());
mallMemberClassMapper.insert(mallMemberClass);
return;
}else if(5 == isNormal){
- //课程卷
+ //民宿卷
MallMemberHouse mallMemberHouse = new MallMemberHouse();
mallMemberHouse.setOrderId(orderId);
+ mallMemberHouse.setOrderNo(mallOrderInfo.getOrderNo());
mallMemberHouse.setMemberId(memberId);
mallMemberHouse.setState(1);
mallMemberHouse.setCreateTime(DateUtil.date());
@@ -456,6 +460,7 @@
mallMemberHouse.setUnuseTime(DateUtil.date().offset(DateField.HOUR_OF_DAY,48));
mallMemberHouse.setHouseName(mallGoods.getHouseName());
mallMemberHouse.setHouseAddress(mallGoods.getHouseAddress());
+ mallMemberHouse.setHousePic(mallGoods.getThumb());
mallMemberHouseMapper.insert(mallMemberHouse);
return;
}else{
--
Gitblit v1.9.1