From 801600b0b5ae9898cf509258e2afa1973fae1813 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 10:32:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java | 3
cloud-server-other/src/main/java/com/dsh/other/entity/OperatorUser.java | 36 ++++
.idea/workspace.xml | 139 +++++------------
cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java | 17 ++
cloud-server-account/pom.xml | 13 +
cloud-server-other/src/main/java/com/dsh/other/entity/Store.java | 4
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 25 ++
cloud-server-account/src/main/java/com/dsh/account/entity/OperatorUser.java | 36 ++++
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 124 ++++++++++++++
cloud-server-other/src/main/java/com/dsh/other/service/impl/TOperatorUserServiceImpl.java | 29 +++
cloud-server-other/src/main/java/com/dsh/other/mapper/TOperatorUserMapper.java | 27 +++
11 files changed, 345 insertions(+), 108 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2808ca5..0ff8df0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,59 +25,10 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.8">
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.12">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/model/IncomeQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/entity/TAppUser.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/FinanceClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/FinanceClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RegisterOrderQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TGameConfig.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/ISiteBookingService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml" afterDir="false" />
</list>
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -126,23 +77,23 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">
- <property name="RequestMappingsPanelOrder0" value="0" />
- <property name="RequestMappingsPanelOrder1" value="1" />
- <property name="RequestMappingsPanelWidth0" value="75" />
- <property name="RequestMappingsPanelWidth1" value="75" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="aspect.path.notification.shown" value="true" />
- <property name="nodejs_package_manager_path" value="npm" />
- <property name="project.structure.last.edited" value="Project" />
- <property name="project.structure.proportion" value="0.0" />
- <property name="project.structure.side.proportion" value="0.2" />
- <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Confirmation" />
- </component>
+ <component name="PropertiesComponent"><![CDATA[{
+ "keyToString": {
+ "git-widget-placeholder": "master",
+ "node.js.selected.package.tslint": "(autodetect)"
+ }
+}]]></component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RecentsManager">
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="D:\javaproject\play\cloud-server-parent" />
+ <recent name="D:\Javaproject\PlayPay\cloud-server-management\src\main\webapp\WEB-INF\view\system\ball" />
+ <recent name="D:\Javaproject\PlayPay\cloud-server-account\src\test\java\com\dsh" />
+ <recent name="D:\Javaproject\PlayPay\cloud-server-management\src\main\webapp\static\modular\system\ball" />
+ <recent name="D:\Javaproject\PlayPay\cloud-server-course\src\main\resources\mapper" />
+ </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\JavaTool\PlayPai1\cloud-server-management\src\main\webapp\static\modular\system\tStudent" />
<recent name="D:\JavaTool\PlayPai1\cloud-server-parent" />
@@ -158,29 +109,12 @@
<recent name="com.dsh.guns.modular.system.service" />
<recent name="com.dsh.other.mapper" />
</key>
- <key name="CopyFile.RECENT_KEYS">
- <recent name="D:\javaproject\play\cloud-server-parent" />
- <recent name="D:\Javaproject\PlayPay\cloud-server-management\src\main\webapp\WEB-INF\view\system\ball" />
- <recent name="D:\Javaproject\PlayPay\cloud-server-account\src\test\java\com\dsh" />
- <recent name="D:\Javaproject\PlayPay\cloud-server-management\src\main\webapp\static\modular\system\ball" />
- <recent name="D:\Javaproject\PlayPay\cloud-server-course\src\main\resources\mapper" />
- </key>
</component>
<component name="RunDashboard">
<option name="configurationTypes">
<set>
<option value="SpringBootApplicationConfigurationType" />
</set>
- </option>
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
</option>
</component>
<component name="RunManager" selected="Spring Boot.GatewayApplication">
@@ -223,8 +157,8 @@
</configuration>
<configuration name="AccountApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-account" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -239,8 +173,8 @@
</configuration>
<configuration name="ActivityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-activity" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -254,16 +188,16 @@
</configuration>
<configuration name="CompetitionApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-competition" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="CourseApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-course" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -276,10 +210,10 @@
</method>
</configuration>
<configuration name="ManagementApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="mb-cloud-management" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" />
<option name="ENABLE_JMX_AGENT" value="false" />
+ <module name="mb-cloud-management" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -298,7 +232,6 @@
</method>
</configuration>
<list>
- <item itemvalue="Application.BigDecimalToChineseWords" />
<item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
<item itemvalue="Spring Boot.ManagementApplication" />
<item itemvalue="Spring Boot.GatewayApplication" />
@@ -308,6 +241,7 @@
<item itemvalue="Spring Boot.AuthApplication" />
<item itemvalue="Spring Boot.CourseApplication" />
<item itemvalue="Spring Boot.CompetitionApplication" />
+ <item itemvalue="应用程序.BigDecimalToChineseWords" />
</list>
<recent_temporary>
<list>
@@ -336,7 +270,7 @@
</serviceView>
</option>
</component>
- <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="false" />
<component name="SvnConfiguration">
<configuration>C:\Users\luo\AppData\Roaming\Subversion</configuration>
</component>
@@ -709,11 +643,26 @@
<option name="project" value="LOCAL" />
<updated>1696753188954</updated>
</task>
- <option name="localTasksCounter" value="41" />
+ <task id="LOCAL-00041" summary="10.11">
+ <option name="closed" value="true" />
+ <created>1696932564568</created>
+ <option name="number" value="00041" />
+ <option name="presentableId" value="LOCAL-00041" />
+ <option name="project" value="LOCAL" />
+ <updated>1696932564568</updated>
+ </task>
+ <task id="LOCAL-00042" summary="10.12">
+ <option name="closed" value="true" />
+ <created>1696989564532</created>
+ <option name="number" value="00042" />
+ <option name="presentableId" value="LOCAL-00042" />
+ <option name="project" value="LOCAL" />
+ <updated>1696989564532</updated>
+ </task>
+ <option name="localTasksCounter" value="43" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="1" />
<option name="exactExcludedFiles">
<list>
<option value="$PROJECT_DIR$/cloud-server-management/node_modules/zrender/index.js" />
@@ -726,17 +675,13 @@
<map>
<entry key="MAIN">
<value>
- <State>
- <option name="COLUMN_ORDER" />
- </State>
+ <State />
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="后台代码删除" />
- <MESSAGE value="后台代码" />
<MESSAGE value="9.15" />
<MESSAGE value="学员" />
<MESSAGE value="学员2" />
@@ -760,7 +705,9 @@
<MESSAGE value="9.26。15" />
<MESSAGE value="10.8" />
<MESSAGE value="10.8。1" />
- <option name="LAST_COMMIT_MESSAGE" value="10.8。1" />
+ <MESSAGE value="10.11" />
+ <MESSAGE value="10.12" />
+ <option name="LAST_COMMIT_MESSAGE" value="10.12" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-account/pom.xml b/cloud-server-account/pom.xml
index 16fac21..c114885 100644
--- a/cloud-server-account/pom.xml
+++ b/cloud-server-account/pom.xml
@@ -15,6 +15,19 @@
<description>账户</description>
<dependencies>
<!--日志处理-->
+
+ <dependency>
+ <groupId>com.github.binarywang</groupId>
+ <artifactId>wx-java-pay-spring-boot-starter</artifactId>
+ <version>4.4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>cn.mb.cloud</groupId>
<artifactId>mb-cloud-common-log</artifactId>
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/OperatorUser.java b/cloud-server-account/src/main/java/com/dsh/account/entity/OperatorUser.java
new file mode 100644
index 0000000..f67651c
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/OperatorUser.java
@@ -0,0 +1,36 @@
+package com.dsh.account.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@TableName("t_operator_user")
+@Data
+public class OperatorUser {
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ @TableField(value = "userId")
+ private Integer userId;
+ @TableField(value = "alipay")
+ private String alipay;
+ @TableField(value = "alipayProportion")
+ private String alipayProportion;
+ @TableField(value = "alipayNum")
+ private String alipayNum;
+ @TableField(value = "wechat")
+ private String wechat;
+ @TableField(value = "wechatProportion")
+ private String wechatProportion;
+ @TableField(value = "wechatNum")
+ private String wechatNum;
+ @TableField(value = "alipayType")
+ private Integer alipayType;
+ @TableField(value = "wechatType")
+ private Integer wechatType;
+ @TableField(value = "operatorId")
+ private Integer operatorId;
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
index 11c4ef3..002a5a5 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
@@ -1,5 +1,6 @@
package com.dsh.account.feignclient.other;
+import com.dsh.account.entity.OperatorUser;
import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.feignclient.other.model.SiteBooking;
import com.dsh.account.model.BillingRequestOfType;
@@ -27,4 +28,6 @@
List<SiteVo> getAppUserSiteList();
@PostMapping("/base/site/queryByCode")
Integer queryByCode(@RequestBody String code);
+ @PostMapping("/base/site/queryOperator")
+ OperatorUser queryOperator(@RequestBody List<Integer> stores);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 551c246..120a41e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -1,16 +1,17 @@
package com.dsh.account.util;
+import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.CertAlipayRequest;
import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.domain.AlipayTradeAppPayModel;
-import com.alipay.api.domain.AlipayTradeQueryModel;
+import com.alipay.api.domain.*;
import com.alipay.api.request.*;
import com.alipay.api.response.*;
import com.dsh.account.dto.Receivers;
+import com.dsh.account.entity.OperatorUser;
import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
import com.dsh.account.feignclient.competition.model.PaymentCompetition;
import com.dsh.account.feignclient.course.CoursePackageClient;
@@ -19,6 +20,10 @@
import com.dsh.account.feignclient.other.model.SiteBooking;
import com.dsh.account.mapper.RechargeRecordsMapper;
import com.dsh.account.util.httpClinet.HttpClientUtil;
+import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingReceiver;
+import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingRequest;
+import com.github.binarywang.wxpay.service.ProfitSharingV3Service;
+import com.github.binarywang.wxpay.service.WxPayService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -26,6 +31,7 @@
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
@@ -150,6 +156,49 @@
model.setTotalAmount(amount);//付款金额
model.setProductCode("QUICK_MSECURITY_PAY");
model.setPassbackParams(passbackParams);//自定义参数
+
+
+ //分账
+ Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
+ Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
+ Integer siteBookings = siteClient.queryByCode(outTradeNo);
+ List<Integer> stores = new ArrayList<>();
+ stores.add(coursePackagePayments);
+ stores.add(paymentCompetitions);
+ stores.add(siteBookings);
+
+ OperatorUser operatorUser = siteClient.queryOperator(stores);
+
+ String alipayProportion = operatorUser.getAlipayProportion();
+ String alipayNum = operatorUser.getAlipayNum();
+
+ ExtendParams extendParams = new ExtendParams();
+// extendParams.setSysServiceProviderId("YOUR_SERVICE_PROVIDER_ID");
+ model.setExtendParams(extendParams);
+
+ RoyaltyInfo royaltyInfo = new RoyaltyInfo();
+// royaltyInfo.setRoyaltyType("transfer");
+
+
+ RoyaltyDetailInfos royaltyDetailInfo1 = new RoyaltyDetailInfos();
+ royaltyDetailInfo1.setTransOutType("userId");
+ royaltyDetailInfo1.setTransOut(aliAppid);
+ royaltyDetailInfo1.setTransInType("loginName");
+ royaltyDetailInfo1.setTransIn("18398968484");
+
+ royaltyDetailInfo1.setDesc("分账描述1");
+ royaltyDetailInfo1.setAmountPercentage(alipayProportion);
+ List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
+
+
+
+
+ royaltyInfo.setRoyaltyDetailInfos(royaltyDetailInfos);
+ model.setRoyaltyInfo(royaltyInfo);
+System.out.println("=================="+royaltyInfo);
+
+
+ //
request.setBizModel(model);
request.setNotifyUrl(callbackPath + notifyUrl);
try {
@@ -452,15 +501,78 @@
@Resource
private SiteClient siteClient;
+ @Autowired
+ private WxPayService wxPayService;
//分账
public ResultUtil order(String code) throws Exception {
-// Integer coursePackagePayments = coursePackageClient.queryByCode(code);
-// Integer paymentCompetitions = competitionsClient.queryByCode(code);
-// Integer siteBookings = siteClient.queryByCode(code);
+ Integer coursePackagePayments = coursePackageClient.queryByCode(code);
+ Integer paymentCompetitions = competitionsClient.queryByCode(code);
+ Integer siteBookings = siteClient.queryByCode(code);
+ List<Integer> stores = new ArrayList<>();
+ stores.add(coursePackagePayments);
+ stores.add(paymentCompetitions);
+ stores.add(siteBookings);
+ OperatorUser operatorUser = siteClient.queryOperator(stores);
+
+
+ WxPayService myWxPayService = wxPayService.switchoverTo("mch_id");
+
+ ProfitSharingV3Service profitSharingV3Service = myWxPayService.getProfitSharingV3Service();
+
+ String nonceStr = RandomUtil.randomString(32);
+ String appId = "您的appid";
+
+
+ //添加分账方
+
+// ProfitSharingReceiver profitSharingReceiver = new ProfitSharingReceiver();
+// profitSharingReceiver.setAccount("appid对应的openId");
+// profitSharingReceiver.setAmount(1l);
+// profitSharingReceiver.setAppid(appId);
+// profitSharingReceiver.setType("PERSONAL_OPENID");
+// profitSharingReceiver.setRelationType("PARTNER");
+// profitSharingV3Service.addProfitSharingReceiver(profitSharingReceiver);
+
+ //分账
+ ProfitSharingRequest profitSharingRequest = new ProfitSharingRequest();
+ profitSharingRequest.setAppid(appId);
+ profitSharingRequest.setTransactionId("微信支付订单号");
+ profitSharingRequest.setOutOrderNo("业务系统唯一编号");
+ //分账完成后，剩余金额自动解冻并返回给商户账号，默认false
+ profitSharingRequest.setUnfreezeUnsplit(true);
+ //待分账金额1元
+ Long money = 1L;
+ List<ProfitSharingReceiver> profitSharingReceivers = new ArrayList<>();
+ ProfitSharingReceiver profitSharingReceiver = new ProfitSharingReceiver();
+ profitSharingReceiver.setAccount("appid对应的openId，分账用户1");
+
+
+ //分账百分之5
+ profitSharingReceiver.setAmount(money * 100 / 5);
+ profitSharingReceiver.setAppid(appId);
+ profitSharingReceiver.setType("PERSONAL_OPENID");
+ profitSharingReceiver.setRelationType("PARTNER");
+ profitSharingReceiver.setDescription("test01");
+ profitSharingReceivers.add(profitSharingReceiver);
+
+ ProfitSharingReceiver receiver = new ProfitSharingReceiver();
+ receiver.setAccount("appid对应的openId，分账用户2");
+ //百分之10
+ receiver.setAmount(money * 100 / 10);
+ receiver.setAppid(appId);
+ receiver.setType("PERSONAL_OPENID");
+ receiver.setRelationType("PARTNER");
+ receiver.setDescription("test02");
+ profitSharingReceivers.add(receiver);
+
+
+ profitSharingRequest.setReceivers(profitSharingReceivers);
+
+ profitSharingV3Service.profitSharing(profitSharingRequest);
@@ -484,10 +596,10 @@
// CloseableHttpResponse closeableHttpResponse = HttpClientUtil.setPostHttpRequset(url, body, headers, "application/json");
//
+ return null;
- return ResultUtil.success();
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 52181c6..380617c 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -5,9 +5,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.other.entity.Site;
-import com.dsh.other.entity.SiteBooking;
-import com.dsh.other.entity.SiteType;
+import com.dsh.other.entity.*;
import com.dsh.other.feignclient.account.CityManagerClient;
import com.dsh.other.feignclient.activity.UserCouponClient;
import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId;
@@ -19,9 +17,7 @@
import com.dsh.other.model.dto.siteDto.TSiteDTO;
import com.dsh.other.model.vo.siteVo.ExpireSiteSearchVO;
import com.dsh.other.model.vo.siteVo.SiteSearchVO;
-import com.dsh.other.service.ISiteBookingService;
-import com.dsh.other.service.ISiteService;
-import com.dsh.other.service.ISiteTypeService;
+import com.dsh.other.service.*;
import com.dsh.other.util.PayMoneyUtil;
import com.dsh.other.util.ResultUtil;
import com.dsh.other.util.TokenUtil;
@@ -527,6 +523,23 @@
}
+ @Autowired
+ private StoreService service;
+
+ @Autowired
+ private IOperatorUserService operatorUserService;
+
+ @ResponseBody
+ @PostMapping("/base/site/queryOperator")
+ public OperatorUser queryOperator(@RequestBody List<Integer> stores){
+
+ Store one = service.getOne(new QueryWrapper<Store>().in("id", stores));
+ OperatorUser o = operatorUserService.getById(one.getOperatorId());
+
+ return o;
+ }
+
+
@ResponseBody
@PostMapping("/base/site/getNewAddSiteList")
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/OperatorUser.java b/cloud-server-other/src/main/java/com/dsh/other/entity/OperatorUser.java
new file mode 100644
index 0000000..0bb145e
--- /dev/null
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/OperatorUser.java
@@ -0,0 +1,36 @@
+package com.dsh.other.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@TableName("t_operator_user")
+@Data
+public class OperatorUser {
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ @TableField(value = "userId")
+ private Integer userId;
+ @TableField(value = "alipay")
+ private String alipay;
+ @TableField(value = "alipayProportion")
+ private String alipayProportion;
+ @TableField(value = "alipayNum")
+ private String alipayNum;
+ @TableField(value = "wechat")
+ private String wechat;
+ @TableField(value = "wechatProportion")
+ private String wechatProportion;
+ @TableField(value = "wechatNum")
+ private String wechatNum;
+ @TableField(value = "alipayType")
+ private Integer alipayType;
+ @TableField(value = "wechatType")
+ private Integer wechatType;
+ @TableField(value = "operatorId")
+ private Integer operatorId;
+}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
index 6f60e0b..e3d3f7a 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
@@ -131,6 +131,10 @@
private Integer state;
+ @TableField("operatorId")
+ private Integer operatorId;
+
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/cloud-server-other/src/main/java/com/dsh/other/mapper/TOperatorUserMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/TOperatorUserMapper.java
new file mode 100644
index 0000000..c7536a1
--- /dev/null
+++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/TOperatorUserMapper.java
@@ -0,0 +1,27 @@
+package com.dsh.other.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.other.entity.OperatorUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 运营商商户 Mapper 接口
+ * </p>
+ */
+public interface TOperatorUserMapper extends BaseMapper<OperatorUser> {
+
+ List<Map<String, Object>> listAll(@Param("page")Page<Map<String, Object>> page,
+ @Param("province") String province,
+ @Param("city")String city,
+ @Param("userName")String userName,
+ @Param("phone") String phone,
+ @Param("platform")Integer platform,
+ @Param("type")Integer type,
+ @Param("state")Integer state);
+
+}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java b/cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java
new file mode 100644
index 0000000..5d1e87a
--- /dev/null
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java
@@ -0,0 +1,17 @@
+package com.dsh.other.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.other.entity.OperatorUser;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 运营商商户 服务类
+ */
+public interface IOperatorUserService extends IService<OperatorUser> {
+
+ List<Map<String, Object>> listAll(Page<Map<String, Object>> page, String province, String city, String userName, String phone, Integer platform, Integer type, Integer state);
+}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/TOperatorUserServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/TOperatorUserServiceImpl.java
new file mode 100644
index 0000000..a24ddee
--- /dev/null
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/TOperatorUserServiceImpl.java
@@ -0,0 +1,29 @@
+package com.dsh.other.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.dsh.other.entity.OperatorUser;
+import com.dsh.other.mapper.TOperatorUserMapper;
+import com.dsh.other.service.IOperatorUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 学员信息 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2023-09-12
+ */
+@Service
+public class TOperatorUserServiceImpl extends ServiceImpl<TOperatorUserMapper, OperatorUser> implements IOperatorUserService {
+
+ @Override
+ public List<Map<String, Object>> listAll(Page<Map<String, Object>> page, String province, String city, String userName, String phone, Integer platform, Integer type, Integer state) {
+ return this.baseMapper.listAll(page,province,city,userName,phone,platform,type,state);
+ }
+}
--
Gitblit v1.7.1