From f3817fad8e422900d3b5d57a63fdc3f3fb2be464 Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Wed, 24 Sep 2025 09:16:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8F=90=E7=8E=B0=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...ithub_wechatpay_apiv3_wechatpay_java_0_2_15.xml | 13 +++
..._wechatpay_apiv3_wechatpay_java_core_0_2_15.xml | 13 +++
.idea/uiDesigner.xml | 124 +++++++++++++++++++++
.../controller/StudytourCashoutLogController.java | 2 +-
.../entity/StudytourCashoutLog.java | 2 +-
.../mapper/StudytourCashoutLogMapper.java | 2 +-
.../service/IStudytourCashoutLogService.java | 2 +-
.../impl/StudytourCashoutLogServiceImpl.java | 2 +-
.../jeecg-boot-module-system.iml | 2 +
.../api/service/Impl/PartnerServiceImpl.java | 1 +
.../api/service/Impl/UserInfoServiceImpl.java | 2 +-
.../src/main/resources/application-dev.yml | 8 +-
studytour-admin.iml | 4 +-
13 files changed, 166 insertions(+), 11 deletions(-)
create mode 100644 .idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml
create mode 100644 .idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml
create mode 100644 .idea/uiDesigner.xml
diff --git a/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml
new file mode 100644
index 0000000..783b541
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml
new file mode 100644
index 0000000..fbc3769
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/controller/StudytourCashoutLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/controller/StudytourCashoutLogController.java
index a2db277..a8e19f6 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/controller/StudytourCashoutLogController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/controller/StudytourCashoutLogController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 提现记录表
* @Author: jeecg-boot
- * @Date: 2025-09-21
+ * @Date: 2025-09-23
* @Version: V1.0
*/
@Api(tags="提现记录表")
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/entity/StudytourCashoutLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/entity/StudytourCashoutLog.java
index 522489e..c4ca337 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/entity/StudytourCashoutLog.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/entity/StudytourCashoutLog.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 提现记录表
* @Author: jeecg-boot
- * @Date: 2025-09-21
+ * @Date: 2025-09-23
* @Version: V1.0
*/
@Data
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/mapper/StudytourCashoutLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/mapper/StudytourCashoutLogMapper.java
index 6bf785f..d35db84 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/mapper/StudytourCashoutLogMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/mapper/StudytourCashoutLogMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 提现记录表
* @Author: jeecg-boot
- * @Date: 2025-09-21
+ * @Date: 2025-09-23
* @Version: V1.0
*/
public interface StudytourCashoutLogMapper extends BaseMapper {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/IStudytourCashoutLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/IStudytourCashoutLogService.java
index bb3f9ef..2eda73e 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/IStudytourCashoutLogService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/IStudytourCashoutLogService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 提现记录表
* @Author: jeecg-boot
- * @Date: 2025-09-21
+ * @Date: 2025-09-23
* @Version: V1.0
*/
public interface IStudytourCashoutLogService extends IService {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/impl/StudytourCashoutLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/impl/StudytourCashoutLogServiceImpl.java
index a2ac387..92a9104 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/impl/StudytourCashoutLogServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/impl/StudytourCashoutLogServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 提现记录表
* @Author: jeecg-boot
- * @Date: 2025-09-21
+ * @Date: 2025-09-23
* @Version: V1.0
*/
@Service
diff --git a/jeecg-boot-module-system/jeecg-boot-module-system.iml b/jeecg-boot-module-system/jeecg-boot-module-system.iml
index 4a1bf6f..be7f453 100644
--- a/jeecg-boot-module-system/jeecg-boot-module-system.iml
+++ b/jeecg-boot-module-system/jeecg-boot-module-system.iml
@@ -289,6 +289,8 @@
+
+
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java
index 8359f65..e4f490b 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java
@@ -447,6 +447,7 @@ public class PartnerServiceImpl implements PartnerService {
public Result cashOut(String token, String userName, BigDecimal transferAmount) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证
+ //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
//提现结果
String massage = "提现申请失败";
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/UserInfoServiceImpl.java
index 00b76c5..c70e499 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/UserInfoServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/UserInfoServiceImpl.java
@@ -39,7 +39,7 @@ public class UserInfoServiceImpl implements UserInfoService {
private IStudytourNoticeService studytourNoticeService;
/******************************************************************************************************************/
-//查询个人信息
+ //查询个人信息
@Override
public Result queryUserInfo(String token){
log.info("开始查询个人信息");
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 a6c4977..0a57d4a 100644
--- a/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -335,10 +335,10 @@ wx:
appid: wxee64675d48680dd4 #微信小程序appid
secret: d7e3f49858350cf40b1aeeb8fa1c61eb #微信小程序密钥
merchantId: 1722176565 # 商户号
- privateKeyPath: jeecg-boot-module-system/src/main/resources/apiclient_key.pem #本地私钥路径
- publicKeyPath: jeecg-boot-module-system/src/main/resources/pub_key.pem #本地公钥路径
-# privateKeyPath: /root/massage/cerFile/apiclient_key.pem #线上私钥路径
-# publicKeyPath: /root/massage/cerFile/pub_key.pem #线上公钥路径
+# privateKeyPath: jeecg-boot-module-system/src/main/resources/apiclient_key.pem #本地私钥路径
+# publicKeyPath: jeecg-boot-module-system/src/main/resources/pub_key.pem #本地公钥路径
+ privateKeyPath: /root/studytour/cerFile/apiclient_key.pem #线上私钥路径
+ publicKeyPath: /root/studytour/cerFile/pub_key.pem #线上公钥路径
publicKeyId: PUB_KEY_ID_0117221765652025082500192305002202 #公钥
merchantSerialNumber: 79312C3428D20B6CE4B071EECC7B7E64E04D11AC # 商户API证书序列号
apiV3Key: 0fdb77429ffdf206c151af76a663041c # 商户APIV3密钥
\ No newline at end of file
diff --git a/studytour-admin.iml b/studytour-admin.iml
index 8021953..1f28d5d 100644
--- a/studytour-admin.iml
+++ b/studytour-admin.iml
@@ -2,7 +2,9 @@
-
+
+
+