From f82c98e725a02aa2596bc4c96478155e2c6532e8 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Wed, 6 Nov 2024 10:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java  | 6 +++++-
 .../src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java          | 4 ++--
 jeecg-boot-module-system/src/main/resources/application-dev.yml     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java
index f32d129..5d080f8 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java
@@ -930,7 +930,11 @@ public class UserVipApiServiceImpl implements UserVipApiService {
         MsgBelece msgBelece = beanleceService.lambdaQuery().eq(MsgBelece::getUserId, hanHaiMember.getId()).one();
         Map map = new HashMap();
         map.put("pageList",pageList);
-        map.put("use_money",msgBelece.getMoney());
+        if(msgBelece == null){
+            map.put("use_money",0);
+        }else{
+            map.put("use_money",msgBelece.getMoney());
+        }
         map.put("lei_give", 0);
         map.put("lei_set",0);
 
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java
index 0feab87..d2ddc6e 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java
@@ -20,8 +20,8 @@ import javax.servlet.http.HttpSession;
 
 public class WeChatJSSDK {
 
-    private static final String APP_ID = "wxe934cebcbc89d869";
-    private static final String APP_SECRET = "78e4e80a2096b362114a7afeefd2ef23";
+    private static final String APP_ID = "wxe36bd1a3deea74a3";
+    private static final String APP_SECRET = "26b451a9eea4b328f48dc864814895d8";
 
     private static String accessToken = null; // 用于缓存access_token
     private static String jsapiTicket = null; // 用于缓存jsapi_ticket
diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml
index a64dd88..8c1db18 100644
--- a/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8000
   tomcat:
     max-swallow-size: -1
   error: