From 9dc6a3ffd0cd9b245d756118d4550aaf0cdf5099 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 29 十月 2025 18:08:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
index 834781d..32256be 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
@@ -131,7 +131,7 @@
}
- String apiPath = "sit/api/v3/labs/trans/preorder";
+ String apiPath = "api/v3/labs/trans/preorder";
String body = "{\n" +
"\t\"req_time\": \"" + time + "\",\n" +
"\t\"version\": \"3.0\",\n" +
@@ -219,7 +219,7 @@
// 操作分账
- HttpRequest post = HttpUtil.createPost(LakalaConfig.getServerUrl() + "sit/api/v3/sacs/separate");
+ HttpRequest post = HttpUtil.createPost(LakalaConfig.getServerUrl() + "api/v3/sacs/separate");
HashMap<String, Object> reqMap = new HashMap<>();
reqMap.put("version", "3.0");
@@ -252,7 +252,7 @@
HashMap<String, Object> map1 = new HashMap<>();
//TODO hzt
- map1.put("recv_no", "SR2024021195105");
+ map1.put("recv_no", "SR2024000144253");
// 手续费
BigDecimal bigDecimal = allMoney.multiply(new BigDecimal("0.038")).setScale(2, RoundingMode.HALF_UP);
payMoney = payMoney.subtract(bigDecimal);
@@ -298,7 +298,7 @@
// String responseStr = response.body();
String authorization1 = getAuthorization(jsonString);
- org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "sit/api/v3/sacs/separate", jsonString, authorization1);
+ org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "api/v3/sacs/separate", jsonString, authorization1);
String responseStr = IOUtils.toString(response1.getEntity().getContent(), ENCODING);
System.err.println("分佣！！！！"+responseStr);
@@ -374,7 +374,7 @@
String outTradeNo = time + str;
String refund_amount = erpProcurement.getPayMoney().multiply(BigDecimal.valueOf(100)).intValue() + "";
- String apiPath = "sit/api/v3/rfd/refund_front/refund";
+ String apiPath = "api/v3/rfd/refund_front/refund";
String body1 = "{\n" +
"\t\"req_data\": {\n" +
"\t\t\"merchant_no\": \""+erpProcurement.getMerchantNo()+"\",\n" +
@@ -478,7 +478,7 @@
}
String outTradeNo = time + str;
String refund_amount = erpProcurement.getPayMoney().multiply(BigDecimal.valueOf(100)).intValue() + "";
- String apiPath = "sit/api/v3/rfd/refund_front/refund";
+ String apiPath = "api/v3/rfd/refund_front/refund";
String body1 = "{\n" +
"\t\"req_data\": {\n" +
@@ -561,7 +561,7 @@
// }
HashMap<String, Object> map1 = new HashMap<>();
// TODO hzt
- map1.put("recv_no", "SR2024021195105");
+ map1.put("recv_no", "SR2024000144253");
map1.put("amt", erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");
objects.add(map1);
map.put("total_amt",erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");
@@ -572,7 +572,7 @@
String jsonString = JSON.toJSONString(reqMap);
String authorization1 = getAuthorization(jsonString);
- org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "sit/api/v3/sacs/fallback", jsonString, authorization1);
+ org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "api/v3/sacs/fallback", jsonString, authorization1);
String responseStr = IOUtils.toString(response1.getEntity().getContent(), ENCODING);
--
Gitblit v1.7.1