From 862288470a25d1f18828c2161e7cad72a399a99e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Jul 2023 18:01:27 +0800
Subject: [PATCH] 购买民宿卷商品，支付完，订单就已经完成
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 e4f02b2..2db5954 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
@@ -145,12 +145,9 @@
if(1 != goodsResult){
throw new FebsException(mallGoods.getGoodsName() + "库存不足");
}
- BigDecimal amount = BigDecimal.ZERO;
- BigDecimal itemPrice = BigDecimal.ZERO;
- /**
- *
- */
- orderItem.setAmount(sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt())));
+ BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
+ BigDecimal itemPrice = sku.getPresentPrice();
+ orderItem.setAmount(amount);
orderItem.setCnt(item.getCnt());
orderItem.setOrderId(orderInfo.getId());
orderItem.setPrice(itemPrice);
@@ -298,7 +295,7 @@
String payResultStr = "";
String wxResultStr = "";
- String amountActualMsg = "";
+ String amountActualMsg = "0";
switch (payOrderDto.getType()) {
case "1":
BrandWCPayRequestData brandWCPayRequestData = null;
@@ -375,8 +372,8 @@
if(amountActual.compareTo(BigDecimal.ZERO) > 0){
mallMoneyFlowService.addMoneyFlow(member.getId(), amountActual.negate(), MoneyFlowTypeEnum.PAY.getValue(),
orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
+ amountActualMsg = amountActual.toString();
}
- amountActualMsg = amountActual.toString();
if(scoreActual.compareTo(BigDecimal.ZERO) > 0){
mallMoneyFlowService.addMoneyFlow(member.getId(), scoreActual.negate(),
MoneyFlowTypeEnum.SCORE_PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"积分支付",2);
@@ -391,12 +388,13 @@
if(stateRoll == 2){
throw new FebsException("兑换券已使用");
}
-
+ mallRollPerk.setState(2);
+ mallRollPerkMapper.updateById(mallRollPerk);
payResultStr = orderInfo.getOrderNo();
orderInfo.setPayOrderNo(payOrderDto.getRollId().toString());
orderInfo.setPayMethod("兑换券支付");
- orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
orderInfo.setPayTime(new Date());
orderInfo.setPayResult("1");
--
Gitblit v1.9.1