Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
shop
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曲欣亮
shop
Commits
ba528799
Commit
ba528799
authored
Aug 08, 2024
by
张永
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付回调成功后,再调用一下拆单过程
parent
84baab25
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
pom.xml
pom.xml
+1
-1
OrderServiceImpl.java
...ava/com/egolm/shop/api/service/impl/OrderServiceImpl.java
+8
-0
redmine.html
src/main/resources/templates/redmine.html
+2
-0
No files found.
pom.xml
View file @
ba528799
...
...
@@ -209,7 +209,7 @@
</executions>
<configuration>
<repository>
dockerhub.linkfern.com/b2c/shopapi
</repository>
<tag>
V1.1.7.8
</tag>
<tag>
V1.1.7.8
.1
</tag>
<buildArgs>
<JAR_FILE>
${project.build.finalName}.jar
</JAR_FILE>
</buildArgs>
...
...
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @
ba528799
...
...
@@ -449,6 +449,14 @@ public class OrderServiceImpl implements OrderService {
String
salesOrderID
=
orderMap
.
get
(
"SalesOrderID"
)+
""
;
String
IsPush
=
orderMap
.
get
(
"IsPush"
)+
""
;
if
(
Status
.
equals
(
"0"
))
{
//为0的时候,再调用一下拆单过程
String
sql1
=
"exec Up_Ego_SplitOrderPrd '"
+
sOutTradeNO
+
"' "
;
List
<
Map
<
String
,
Object
>>
cdReturnMap
=
jdbcTemplate
.
executeMutil
(
sql1
).
getDatas
().
get
(
0
);
logger
.
info
(
"支付对应的订单号:{},支付单号:{} ,调用拆单过程结果:{} "
,
salesOrderID
,
sOutTradeNO
,
GsonUtil
.
toJson
(
cdReturnMap
));
}
else
{
logger
.
info
(
"支付对应的订单号:{},支付单号:{} ,支付状态不对,不调用拆单过程。"
,
salesOrderID
,
sOutTradeNO
);
}
if
(
Status
.
equals
(
"99"
))
{
//需求 #16796
String
ErrorMsg
=
orderMap
.
get
(
"ErrorMsg"
)+
""
;
String
sql
=
"update tSalesOrderPay set sErrorMsg = ? where sSalesOrderID = ? "
;
...
...
src/main/resources/templates/redmine.html
View file @
ba528799
...
...
@@ -24,6 +24,8 @@
</head>
<body>
<div
id=
"app"
>
<el-divider
content-position=
"left"
>
V1.1.7.8.1 2024-8-8
</el-divider>
<p
class=
"title"
>
1.解决支付回调时,Status=0时再调用一次拆单过程。
</p>
<el-divider
content-position=
"left"
>
V1.1.7.8 2024-7-20
</el-divider>
<p
class=
"title"
>
1.解决补款单、结算单回调 遇到Process时 重试最多3次
</p>
<el-divider
content-position=
"left"
>
V1.1.7.7 2024-7-18
</el-divider>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment