From d5c20725b76c9f8be34d7b5ee9cefa07dba1c2b1 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Fri, 7 Nov 2025 14:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E9=87=91=E9=A2=9D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pay/alipay/service/impl/AliPayServiceImpl.java     | 3 ++-
 .../modules/pay/weChatPay/service/impl/WxpayServiceImpl.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 52b3f3f7..b2cf9abf 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
@@ -228,12 +228,13 @@ public class AliPayServiceImpl  implements AliPayService {
                         BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(Integer.valueOf(body));
                         MyUserEntity userEntity = userService.getById(order.getUserId());
                         if (Integer.valueOf(body)==0){//自定义充值
+                            bookBuyConfigEntity = new BookBuyConfigEntity();
                             bookBuyConfigEntity.setRealMoney(order.getRealMoney());
                             bookBuyConfigEntity.setMoney(order.getRealMoney());
                             bookBuyConfigEntity.setQudao("Android");
                         }
                         //充值送积分
-                        if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) {
+                        if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf() != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) {
                             userEntity.setJf(userEntity.getJf().add(bookBuyConfigEntity.getGivejf()));
                             userService.updateById(userEntity);
                             JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
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 c023d251..80b4f77d 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
@@ -320,13 +320,14 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
             Integer buyorder = payWechatOrder.getBuyOrderId();
             BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(buyorder);
             if (buyorder==0){//自定义充值
+                bookBuyConfigEntity = new BookBuyConfigEntity();
                 bookBuyConfigEntity.setRealMoney(payWechatOrder.getTotalAmount());
                 bookBuyConfigEntity.setMoney(payWechatOrder.getTotalAmount());
                 bookBuyConfigEntity.setQudao("Android");
             }
             MyUserEntity userEntity = userService.getById(order.getUserId());
             //充值送积分
-            if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) {
+            if (bookBuyConfigEntity != null && bookBuyConfigEntity.getGivejf() != null && bookBuyConfigEntity.getGivejf().compareTo(BigDecimal.ZERO)>0) {
                 userEntity.setJf(userEntity.getJf().add(bookBuyConfigEntity.getGivejf()));
                 userService.updateById(userEntity);
                 JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();