Skip to content

S
shop
Commit ba528799 authored by 张永's avatar 张永
Browse files
Options

支付回调成功后，再调用一下拆单过程

parent 84baab25
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 1 deletion
pom.xml
View file @ ba528799
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</executions> </executions>
<configuration> <configuration>
<repository>dockerhub.linkfern.com/b2c/shopapi</repository> <repository>dockerhub.linkfern.com/b2c/shopapi</repository>
<tag>V1.1.7.8</tag> <tag>V1.1.7.8.1</tag>
<buildArgs> <buildArgs>
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE> <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
</buildArgs> </buildArgs>
......
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @ ba528799
...@@ -449,6 +449,14 @@ public class OrderServiceImpl implements OrderService { ...@@ -449,6 +449,14 @@ public class OrderServiceImpl implements OrderService {
String salesOrderID = orderMap.get("SalesOrderID")+""; String salesOrderID = orderMap.get("SalesOrderID")+"";
String IsPush = orderMap.get("IsPush")+""; 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 if(Status.equals("99")) { //需求 #16796
String ErrorMsg = orderMap.get("ErrorMsg")+""; String ErrorMsg = orderMap.get("ErrorMsg")+"";
String sql = "update tSalesOrderPay set sErrorMsg = ? where sSalesOrderID = ? "; String sql = "update tSalesOrderPay set sErrorMsg = ? where sSalesOrderID = ? ";
......
src/main/resources/templates/redmine.html
View file @ ba528799
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
</head> </head>
<body> <body>
<div id="app"> <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> <el-divider content-position="left">V1.1.7.8 2024-7-20</el-divider>
<p class="title">1.解决补款单、结算单回调 遇到Process时 重试最多3次</p> <p class="title">1.解决补款单、结算单回调 遇到Process时 重试最多3次</p>
<el-divider content-position="left">V1.1.7.7 2024-7-18</el-divider> <el-divider content-position="left">V1.1.7.7 2024-7-18</el-divider>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment