Browse Source

1、提现模块修复

master
Aug 1 month ago
parent
commit
f3817fad8e
13 changed files with 166 additions and 11 deletions
  1. +13
    -0
      .idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml
  2. +13
    -0
      .idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml
  3. +124
    -0
      .idea/uiDesigner.xml
  4. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/controller/StudytourCashoutLogController.java
  5. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/entity/StudytourCashoutLog.java
  6. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/mapper/StudytourCashoutLogMapper.java
  7. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/IStudytourCashoutLogService.java
  8. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/impl/StudytourCashoutLogServiceImpl.java
  9. +2
    -0
      jeecg-boot-module-system/jeecg-boot-module-system.iml
  10. +1
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java
  11. +1
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/UserInfoServiceImpl.java
  12. +4
    -4
      jeecg-boot-module-system/src/main/resources/application-dev.yml
  13. +3
    -1
      studytour-admin.iml

+ 13
- 0
.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.15">
<CLASSES>
<root url="jar://D:/Softwares/Environments/Maven/apache-maven-3.6.1/Repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/Softwares/Environments/Maven/apache-maven-3.6.1/Repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/Softwares/Environments/Maven/apache-maven-3.6.1/Repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15-sources.jar!/" />
</SOURCES>
</library>
</component>

+ 13
- 0
.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.15">
<CLASSES>
<root url="jar://D:/Softwares/Environments/Maven/apache-maven-3.6.1/Repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/Softwares/Environments/Maven/apache-maven-3.6.1/Repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/Softwares/Environments/Maven/apache-maven-3.6.1/Repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15-sources.jar!/" />
</SOURCES>
</library>
</component>

+ 124
- 0
.idea/uiDesigner.xml View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/controller/StudytourCashoutLogController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/** /**
* @Description: 提现记录表 * @Description: 提现记录表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2025-09-21
* @Date: 2025-09-23
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags="提现记录表") @Api(tags="提现记录表")


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/entity/StudytourCashoutLog.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/** /**
* @Description: 提现记录表 * @Description: 提现记录表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2025-09-21
* @Date: 2025-09-23
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/mapper/StudytourCashoutLogMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @Description: 提现记录表 * @Description: 提现记录表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2025-09-21
* @Date: 2025-09-23
* @Version: V1.0 * @Version: V1.0
*/ */
public interface StudytourCashoutLogMapper extends BaseMapper<StudytourCashoutLog> { public interface StudytourCashoutLogMapper extends BaseMapper<StudytourCashoutLog> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/IStudytourCashoutLogService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* @Description: 提现记录表 * @Description: 提现记录表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2025-09-21
* @Date: 2025-09-23
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IStudytourCashoutLogService extends IService<StudytourCashoutLog> { public interface IStudytourCashoutLogService extends IService<StudytourCashoutLog> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCashoutLog/service/impl/StudytourCashoutLogServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/** /**
* @Description: 提现记录表 * @Description: 提现记录表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2025-09-21
* @Date: 2025-09-23
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service


+ 2
- 0
jeecg-boot-module-system/jeecg-boot-module-system.iml View File

@ -289,6 +289,8 @@
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.5.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.15" level="project" />
<orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.15" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />


+ 1
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/PartnerServiceImpl.java View File

@ -447,6 +447,7 @@ public class PartnerServiceImpl implements PartnerService {
public Result<?> cashOut(String token, String userName, BigDecimal transferAmount) { public Result<?> cashOut(String token, String userName, BigDecimal transferAmount) {
//权限验证 //权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证
//HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
//提现结果 //提现结果
String massage = "提现申请失败"; String massage = "提现申请失败";


+ 1
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/UserInfoServiceImpl.java View File

@ -39,7 +39,7 @@ public class UserInfoServiceImpl implements UserInfoService {
private IStudytourNoticeService studytourNoticeService; private IStudytourNoticeService studytourNoticeService;
/******************************************************************************************************************/ /******************************************************************************************************************/
//查询个人信息
//查询个人信息
@Override @Override
public Result<?> queryUserInfo(String token){ public Result<?> queryUserInfo(String token){
log.info("开始查询个人信息"); log.info("开始查询个人信息");


+ 4
- 4
jeecg-boot-module-system/src/main/resources/application-dev.yml View File

@ -335,10 +335,10 @@ wx:
appid: wxee64675d48680dd4 #微信小程序appid appid: wxee64675d48680dd4 #微信小程序appid
secret: d7e3f49858350cf40b1aeeb8fa1c61eb #微信小程序密钥 secret: d7e3f49858350cf40b1aeeb8fa1c61eb #微信小程序密钥
merchantId: 1722176565 # 商户号 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 #公钥 publicKeyId: PUB_KEY_ID_0117221765652025082500192305002202 #公钥
merchantSerialNumber: 79312C3428D20B6CE4B071EECC7B7E64E04D11AC # 商户API证书序列号 merchantSerialNumber: 79312C3428D20B6CE4B071EECC7B7E64E04D11AC # 商户API证书序列号
apiV3Key: 0fdb77429ffdf206c151af76a663041c # 商户APIV3密钥 apiV3Key: 0fdb77429ffdf206c151af76a663041c # 商户APIV3密钥

+ 3
- 1
studytour-admin.iml View File

@ -2,7 +2,9 @@
<module type="WEB_MODULE" version="4"> <module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>

Loading…
Cancel
Save