From b2eb0b902dce2d5df613ecfb2ec6eb579bcac135 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 14 Apr 2025 13:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=A3=E9=99=A4=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E6=97=B6=E4=B8=BA=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/controller/CourseRelearnController.java     | 2 +-
 .../common/service/impl/JfTransactionDetailsServiceImpl.java   | 2 +-
 .../master/controller/JfTransactionDetailsController.java      | 3 ++-
 .../modules/pay/alipay/service/impl/AliPayServiceImpl.java     | 2 +-
 .../modules/pay/weChatPay/service/impl/WxpayServiceImpl.java   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java b/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java
index 598c4f1f..eab0b276 100644
--- a/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java
+++ b/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java
@@ -221,7 +221,7 @@ public class CourseRelearnController {
         JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
         jfTransactionDetails.setUserId(userEntity.getId());
         jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate());
-        jfTransactionDetails.setActType(0);
+        jfTransactionDetails.setActType(1);
         jfTransactionDetails.setUserBalance(userEntity.getJf());
         jfTransactionDetails.setRelationId(order.getOrderId());
         jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn());
diff --git a/src/main/java/com/peanut/modules/common/service/impl/JfTransactionDetailsServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/JfTransactionDetailsServiceImpl.java
index 20500aae..7ee22394 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/JfTransactionDetailsServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/JfTransactionDetailsServiceImpl.java
@@ -16,7 +16,7 @@ public class JfTransactionDetailsServiceImpl extends ServiceImpl<JfTransactionDe
         JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
         jfTransactionDetails.setUserId(user.getId());
         jfTransactionDetails.setChangeAmount(jf.negate());
-        jfTransactionDetails.setActType(0);
+        jfTransactionDetails.setActType(1);
         jfTransactionDetails.setUserBalance(user.getJf());
         jfTransactionDetails.setRelationId(buyOrder.getOrderId());
         jfTransactionDetails.setRemark("消费积分抵扣："+jf.toString()+",订单号:"+buyOrder.getOrderSn());
diff --git a/src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java b/src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java
index 047b45a0..5ae692e6 100644
--- a/src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java
+++ b/src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java
@@ -82,13 +82,14 @@ public class JfTransactionDetailsController {
         if (actType.equals("0")) {
             jf.setActType(0);
             user.setJf(user.getJf().add(changeAmount));
+            jf.setChangeAmount(changeAmount);
         }else {
             jf.setActType(1);
             user.setJf(user.getJf().subtract(changeAmount));
+            jf.setChangeAmount(changeAmount.negate());
         }
         userService.updateById(user);
         jf.setUserId(user.getId());
-        jf.setChangeAmount(changeAmount);
         jf.setRemark(params.get("remark").toString());
         jf.setUserBalance(user.getJf());
         jfService.save(jf);
diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
index 839b6804..b2cb29cd 100644
--- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
+++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
@@ -383,7 +383,7 @@ public class AliPayServiceImpl  implements AliPayService {
         JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
         jfTransactionDetails.setUserId(userEntity.getId());
         jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate());
-        jfTransactionDetails.setActType(0);
+        jfTransactionDetails.setActType(1);
         jfTransactionDetails.setUserBalance(userEntity.getJf());
         jfTransactionDetails.setRelationId(order.getOrderId());
         jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn());
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
index 53c79712..d6a0b220 100644
--- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
@@ -355,7 +355,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
         JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
         jfTransactionDetails.setUserId(userEntity.getId());
         jfTransactionDetails.setChangeAmount(order.getJfDeduction().negate());
-        jfTransactionDetails.setActType(0);
+        jfTransactionDetails.setActType(1);
         jfTransactionDetails.setUserBalance(userEntity.getJf());
         jfTransactionDetails.setRelationId(order.getOrderId());
         jfTransactionDetails.setRemark("消费积分抵扣："+order.getJfDeduction().toString()+",订单号:"+order.getOrderSn());