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/ApiMallOrderInfoServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 4ba8266..1cf955f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -387,6 +387,7 @@
throw new FebsException("兑换券已使用");
}
mallRollPerk.setState(2);
+ mallRollPerk.setUpdateTime(DateUtil.date());
mallRollPerkMapper.updateById(mallRollPerk);
payResultStr = orderInfo.getOrderNo();
@@ -406,12 +407,12 @@
BigDecimal balanceThree = mallMemberWalletThree.getBalance();
BigDecimal amountThree = orderInfo.getAmount();
- int reduceThree = memberWalletService.reduce(balanceThree, member.getId(), "balance");
- if (reduceThree == 2) {
- throw new FebsException("余额不足");
- }
- mallMoneyFlowService.addMoneyFlow(member.getId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
- orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
+// int reduceThree = memberWalletService.reduce(balanceThree, member.getId(), "balance");
+// if (reduceThree == 2) {
+// throw new FebsException("余额不足");
+// }
+// mallMoneyFlowService.addMoneyFlow(member.getId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
+// orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
//实际支付余额
BigDecimal amountActualThree = amountThree.subtract(balanceThree).setScale(2, BigDecimal.ROUND_DOWN);
@@ -426,6 +427,7 @@
wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestDataThree);
payResultStr = brandWCPayRequestDataThree.getPrepay_id();
orderInfo.setPayMethod("余额加微信");
+ orderInfo.setAmount(amountThree);
amountActualMsg = amountThree.toString();
break;
/**
@@ -645,6 +647,19 @@
orderInfo.setReceivingTime(new Date());
this.baseMapper.updateById(orderInfo);
+ //是否返利
+ if(ObjectUtil.isNotEmpty(member.getReferrerId())){
+ String referrerId = member.getReferrerId();
+ MallMember mallMemberParent = memberMapper.selectInfoByInviteId(referrerId);
+ Long parentId = mallMemberParent.getId();
+ String orderNo = orderInfo.getOrderNo();
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, member.getId(), parentId);
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setIsReturn(1);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ memberWalletService.add(mallMoneyFlow.getAmount(), id, "balance");
+ }
+
//生成一条团长提成记录
// Long orderInfoId = orderInfo.getId();
// List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);
--
Gitblit v1.9.1