From dacdca90b0faed8a38d56b2bab0df3ad3b9982b1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 31 Jan 2024 10:38:14 +0800
Subject: [PATCH] 会员列表增加波卷功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 97 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 86 insertions(+), 11 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 1656f38..aa7fd5e 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
@@ -294,6 +294,7 @@
String payResultStr = "";
String wxResultStr = "";
String amountActualMsg = "0";
+ StringBuffer stringBuffer = new StringBuffer();
switch (payOrderDto.getType()) {
case "1":
BrandWCPayRequestData brandWCPayRequestData = null;
@@ -321,6 +322,11 @@
orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
amountActualMsg = orderInfo.getAmount().toString();
+
+ stringBuffer.append(orderInfo.getId().toString());
+ stringBuffer.append("@");
+ stringBuffer.append(amountActualMsg);
+ agentProducer.sendOrderGetMsg(stringBuffer.toString());
break;
case "3":
/**
@@ -376,6 +382,11 @@
mallMoneyFlowService.addMoneyFlow(member.getId(), scoreActual.negate(),
MoneyFlowTypeEnum.SCORE_PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"积分支付",2);
}
+
+ stringBuffer.append(orderInfo.getId().toString());
+ stringBuffer.append("@");
+ stringBuffer.append(amountActualMsg);
+ agentProducer.sendOrderGetMsg(stringBuffer.toString());
break;
case "4":
MallRollPerk mallRollPerk = mallRollPerkMapper.selectById(payOrderDto.getRollId());
@@ -395,6 +406,11 @@
orderInfo.setPayMethod("兑换券支付");
orderInfo.setPayTime(new Date());
orderInfo.setPayResult("1");
+
+ stringBuffer.append(orderInfo.getId().toString());
+ stringBuffer.append("@");
+ stringBuffer.append(amountActualMsg);
+ agentProducer.sendOrderGetMsg(stringBuffer.toString());
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.ROLL_PAY.getValue(),
orderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue());
@@ -429,6 +445,11 @@
orderInfo.setPayMethod("余额加微信");
orderInfo.setAmount(amountThree);
amountActualMsg = amountThree.toString();
+
+ stringBuffer.append(orderInfo.getId().toString());
+ stringBuffer.append("@");
+ stringBuffer.append(amountActualMsg);
+ agentProducer.sendOrderGetMsg(stringBuffer.toString());
break;
/**
* 积分加余额
@@ -465,6 +486,11 @@
mallMoneyFlowService.addMoneyFlow(member.getId(), amountActualOne.negate(), MoneyFlowTypeEnum.PAY.getValue(),
orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
amountActualMsg = amountActualOne.toString();
+
+ stringBuffer.append(orderInfo.getId().toString());
+ stringBuffer.append("@");
+ stringBuffer.append(amountActualMsg);
+ agentProducer.sendOrderGetMsg(stringBuffer.toString());
orderInfo.setPayMethod("积分加余额");
mallMoneyFlowService.addMoneyFlow(member.getId(), scoreOne.negate(),
@@ -505,6 +531,12 @@
payResultStr = brandWCPayRequestDataTwo.getPrepay_id();
orderInfo.setPayMethod("积分加微信");
amountActualMsg = amountActualTwo.toString();
+
+
+ stringBuffer.append(orderInfo.getId().toString());
+ stringBuffer.append("@");
+ stringBuffer.append(amountActualMsg);
+ agentProducer.sendOrderGetMsg(stringBuffer.toString());
break;
default:
throw new FebsException("请选择正确的支付方式");
@@ -518,11 +550,11 @@
String takeCode = ShareCodeUtil.toSerialCode(orderInfo.getId());
orderInfo.setTakeCode(takeCode);
this.baseMapper.updateById(orderInfo);
- StringBuffer stringBuffer = new StringBuffer();
- stringBuffer.append(orderInfo.getId().toString());
- stringBuffer.append("@");
- stringBuffer.append(amountActualMsg);
- agentProducer.sendOrderGetMsg(stringBuffer.toString());
+// StringBuffer stringBuffer = new StringBuffer();
+// stringBuffer.append(orderInfo.getId().toString());
+// stringBuffer.append("@");
+// stringBuffer.append(amountActualMsg);
+// agentProducer.sendOrderGetMsg(stringBuffer.toString());
agentProducer.sendRollSendMsg(orderInfo.getId());
// OrderStateDto orderStateDto = new OrderStateDto();
@@ -624,7 +656,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void confirmOrder(Long id) {
- MallMember member = LoginUserUtil.getLoginUser();
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember member = mallMemberMapper.selectById(memberId);
MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
throw new FebsException("订单不存在");
@@ -653,11 +686,53 @@
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(), parentId, "balance");
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, parentId, member.getId());
+ if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setIsReturn(1);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ memberWalletService.add(mallMoneyFlow.getAmount(), parentId, "balance");
+ }
+
+ if(ObjectUtil.isNotEmpty(mallMemberParent.getReferrerId())){
+ String referrerIdUp = mallMemberParent.getReferrerId();
+ MallMember mallMemberParentUp = memberMapper.selectInfoByInviteId(referrerIdUp);
+ Long parentIdUp = mallMemberParentUp.getId();
+ MallMoneyFlow mallMoneyFlowUp = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, parentIdUp, parentId);
+ if(ObjectUtil.isNotEmpty(mallMoneyFlowUp)){
+ mallMoneyFlowUp.setStatus(2);
+ mallMoneyFlowUp.setIsReturn(1);
+ mallMoneyFlowMapper.updateById(mallMoneyFlowUp);
+ memberWalletService.add(mallMoneyFlow.getAmount(), parentIdUp, "balance");
+ }
+ }
+ }
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfo.getId());
+ if(CollUtil.isNotEmpty(mallOrderItemList)){
+ for(MallOrderItem mallOrderItem : mallOrderItemList){
+ Long goodsId = mallOrderItem.getGoodsId();
+ MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
+ if(ObjectUtil.isEmpty(mallGoods)){
+ break;
+ }
+ //是否送券 1:是 2:否
+ BigDecimal levelTwoPrice = mallGoods.getLevelTwoPrice();
+ if(BigDecimal.ONE.compareTo(levelTwoPrice) == 0){
+ MallRollPerk mallRollPerk = new MallRollPerk();
+ mallRollPerk.setMemberId(member.getId());
+ mallRollPerk.setState(1);
+ mallRollPerk.setRollId(mallGoods.getLevelThreePrice().longValue());
+ mallRollPerkMapper.insert(mallRollPerk);
+ }
+ //赠送积分
+ BigDecimal levelOnePrice = mallGoods.getLevelOnePrice();
+ if(BigDecimal.ZERO.compareTo(levelOnePrice) <= 0){
+ memberWalletService.add(levelOnePrice, member.getId(), "score");
+
+ mallMoneyFlowService.addMoneyFlow(member.getId(), levelOnePrice, MoneyFlowTypeEnum.STATIC_BONUS.getValue(),
+ orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"赠送积分",2);
+ }
+ }
}
}
--
Gitblit v1.9.1