From 3e33f8891f33aad44540b40a005e84917b649314 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 26 Dec 2023 10:58:41 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index ec1ee47..197a871 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -256,15 +256,18 @@
log.info("订单支付状态---status:{}", order.getStatus());
if (order != null && OrderStatusEnum.WAIT_PAY.getValue() == order.getStatus()) {
- log.debug("检查支付金额payMoney={},order.getPayMoney()={}", payMoney, order.getAmount());
- order.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ log.info("检查支付金额payMoney={},order.getPayMoney()={}", payMoney, order.getAmount());
+// order.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ order.setStatus(OrderStatusEnum.FINISH.getValue());
order.setPayResult(1);
order.setPayTime(new Date());
- order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
+ order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
mallOrderInfoMapper.updateById(order);
Long memberId = order.getMemberId();
MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
if(ObjectUtil.isNotEmpty(mallMemberWallet)){
+
+ log.info("订单支付用户钱包---mallMemberWallet:{},{}", mallMemberWallet.getBalance(),mallMemberWallet.getScore());
List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(order.getId());
if(ObjectUtil.isNotEmpty(mallOrderItemList)){
/**
@@ -288,6 +291,9 @@
BigDecimal multiply = subtractPrice.divide(presentPrice, 2, BigDecimal.ROUND_DOWN).multiply(mallOrderItem.getAmount());
totalScoreAdd = totalScoreAdd.add(multiply);
}
+
+
+ log.info("订单支付加积分---totalScoreAdd:{}", totalScoreAdd);
if(totalScoreAdd.compareTo(BigDecimal.ZERO) <= 0){
return;
}
--
Gitblit v1.9.1