From cc9ce86cc24c413c9cbd303b8bb4fd9f5ec5a30f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Jul 2023 10:04:53 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 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 2d691b5..07484b5 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
@@ -13,10 +13,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
-import cc.mrbird.febs.mall.vo.ApiLeaderListVo;
-import cc.mrbird.febs.mall.vo.OrderDetailVo;
-import cc.mrbird.febs.mall.vo.OrderListVo;
-import cc.mrbird.febs.mall.vo.OrderRefundVo;
+import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.model.OrderStateDto;
import cc.mrbird.febs.pay.service.IPayService;
@@ -84,6 +81,7 @@
private final MallElectronicFenceMapper mallElectronicFenceMapper;
private final MallMemberWalletMapper mallMemberWalletMapper;
private final MallRollPerkMapper mallRollPerkMapper;
+ private final MallMoneyFlowMapper mallMoneyFlowMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -111,7 +109,7 @@
orderInfo.setStatus(OrderStatusEnum.WAIT_PAY.getValue());
orderInfo.setRemark(addOrderDto.getRemark());
orderInfo.setOrderType(addOrderDto.getOrderType());
- orderInfo.setDeliveryType(addOrderDto.getDeliveryType() == null ? 2 : addOrderDto.getDeliveryType());
+ orderInfo.setDeliveryType(addOrderDto.getDeliveryType());
if (CollUtil.isEmpty(addOrderDto.getItems())) {
throw new FebsException("参数错误");
}
@@ -389,6 +387,7 @@
throw new FebsException("兑换券已使用");
}
mallRollPerk.setState(2);
+ mallRollPerk.setUpdateTime(DateUtil.date());
mallRollPerkMapper.updateById(mallRollPerk);
payResultStr = orderInfo.getOrderNo();
@@ -408,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);
@@ -615,6 +614,9 @@
long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
orderDetailVo.setRemainTime(remainTime);
}
+ String orderNo = orderInfo.getOrderNo();
+ List<MoneyFlowVo> moneyFlowVos = mallMoneyFlowMapper.selectMoneyFlowByOrderNo(orderNo,orderInfo.getMemberId());
+ orderDetailVo.setMoneyFlowVos(moneyFlowVos);
return orderDetailVo;
}
--
Gitblit v1.9.1