From ed711403d3e9fcc3942fe9ef1719fbe2e94b0d31 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 11 十月 2023 10:17:38 +0800
Subject: [PATCH] 10.12
---
.idea/workspace.xml | 16 ++++++++++++----
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 3 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 52d1bf5..0ff8df0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,7 +25,7 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.11">
+ <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/util/PayMoneyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" afterDir="false" />
</list>
@@ -651,7 +651,15 @@
<option name="project" value="LOCAL" />
<updated>1696932564568</updated>
</task>
- <option name="localTasksCounter" value="42" />
+ <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">
@@ -674,7 +682,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="后台代码" />
<MESSAGE value="9.15" />
<MESSAGE value="学员" />
<MESSAGE value="学员2" />
@@ -699,7 +706,8 @@
<MESSAGE value="10.8" />
<MESSAGE value="10.8。1" />
<MESSAGE value="10.11" />
- <option name="LAST_COMMIT_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/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 55e132f..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
@@ -159,7 +159,6 @@
//分账
-
Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
Integer siteBookings = siteClient.queryByCode(outTradeNo);
@@ -180,6 +179,7 @@
RoyaltyInfo royaltyInfo = new RoyaltyInfo();
// royaltyInfo.setRoyaltyType("transfer");
+
RoyaltyDetailInfos royaltyDetailInfo1 = new RoyaltyDetailInfos();
royaltyDetailInfo1.setTransOutType("userId");
royaltyDetailInfo1.setTransOut(aliAppid);
@@ -195,6 +195,7 @@
royaltyInfo.setRoyaltyDetailInfos(royaltyDetailInfos);
model.setRoyaltyInfo(royaltyInfo);
+System.out.println("=================="+royaltyInfo);
//
--
Gitblit v1.7.1