Skip to content

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

V1.1.1

parent 0c54d485
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
pom.xml
View file @ daa77baa
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</executions> </executions>
<configuration> <configuration>
<repository>dockerhub.linkfern.com/b2c/shopapi</repository> <repository>dockerhub.linkfern.com/b2c/shopapi</repository>
<tag>V1.1.0</tag> <tag>V1.1.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 @ daa77baa
...@@ -1267,11 +1267,12 @@ public class OrderServiceImpl implements OrderService { ...@@ -1267,11 +1267,12 @@ public class OrderServiceImpl implements OrderService {
// up_B2BCancelOrderBizPayCallBack // up_B2BCancelOrderBizPayCallBack
String status = event_content.getString("status"); String status = event_content.getString("status");
if (status.equals("SUCCEEDED")) {// 退款成功 if (status.equals("SUCCEEDED")) {// 退款成功
String refund_id = event_content.getString("refund_id"); String out_refund_id = event_content.getString("out_refund_id"); //系统生成的退款单号
String refund_id = event_content.getString("refund_id"); //微企付生成的
String succeeded_time = event_content.getString("succeeded_time").replace("T", " ") String succeeded_time = event_content.getString("succeeded_time").replace("T", " ")
.replace("+08:00", ""); // 东八区时间 如:2021-06-08T10:34:56+08:00，status=SUCCEEDED时返回 .replace("+08:00", ""); // 东八区时间 如:2021-06-08T10:34:56+08:00，status=SUCCEEDED时返回
String refund_amount = event_content.getString("refund_amount"); // 退款金额 String refund_amount = event_content.getString("refund_amount"); // 退款金额
String sql = "exec up_B2BCancelOrderBizPayCallBack '" + out_payment_id + "' ,'" + payment_id + "','" String sql = "exec up_B2BCancelOrderBizPayAsyncCallBack '" + out_payment_id + "' ,'" + payment_id + "','"
+ refund_id + "' , '" + refund_amount + "' , '" + succeeded_time + "' , '" + PayTypeID + refund_id + "' , '" + refund_amount + "' , '" + succeeded_time + "' , '" + PayTypeID
+ "' , '0' , '退款成功' "; + "' , '0' , '退款成功' ";
returnMap = jdbcTemplate.executeMutil(sql).getDatas().get(0); returnMap = jdbcTemplate.executeMutil(sql).getDatas().get(0);
...@@ -1321,7 +1322,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -1321,7 +1322,7 @@ public class OrderServiceImpl implements OrderService {
String RefundAmount = reqObj.getString("RefundAmount"); // 退款金额。币种同原 交易 String RefundAmount = reqObj.getString("RefundAmount"); // 退款金额。币种同原 交易
String sql = "exec up_B2BCancelOrderBizPayCallBack '" + OutRefundNo + "' ,'" + RelateOrderNo + "','" String sql = "exec up_B2BCancelOrderBizPayAsyncCallBack '" + OutRefundNo + "' ,'" + RelateOrderNo + "','"
+ RefundOrderNo + "' , '" + RefundAmount + "' , '" + succeeded_time + "' , '" + PayTypeID + RefundOrderNo + "' , '" + RefundAmount + "' , '" + succeeded_time + "' , '" + PayTypeID
+ "' , '0' , '退款成功' "; + "' , '0' , '退款成功' ";
returnMap = jdbcTemplate.executeMutil(sql).getDatas().get(0); returnMap = jdbcTemplate.executeMutil(sql).getDatas().get(0);
......
src/main/resources/templates/redmine.html
View file @ daa77baa
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<el-divider content-position="left">V1.1.1</el-divider>
<p class="title">1.修改微企付和网商银行的退款回调过程</p>
<el-divider content-position="left">V1.1.0</el-divider> <el-divider content-position="left">V1.1.0</el-divider>
<p class="title">1.增加微企付和网商银行的回调</p> <p class="title">1.增加微企付和网商银行的回调</p>
<el-divider content-position="left">V1.0.0</el-divider> <el-divider content-position="left">V1.0.0</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