From ae5d6a014acaf77852c324e7f26201ba7f81598e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 30 九月 2025 11:10:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
index 91a8a50..679665e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
@@ -151,6 +151,7 @@
"\t\t\"trans_type\": \""+trans_type+"\"\n" +
"\t}\n" +
"}";
+
String authorization = getAuthorization(body);
org.apache.http.HttpResponse response = post(LakalaConfig.getServerUrl() + apiPath, body, authorization);
if (response.getStatusLine().getStatusCode() != 200) {
@@ -168,7 +169,7 @@
erpProcurement.setStatus(2);
erpProcurement.setTermNo(supplier.getTermNo());
erpProcurement.setAccountType(type);
- erpProcurement.setTransType("41");
+ erpProcurement.setTransType(trans_type);
erpProcurementService.updateById(erpProcurement);
return R.ok(responseStr);
@@ -261,7 +262,7 @@
}
HashMap<String, Object> map1 = new HashMap<>();
//TODO hzt
- map1.put("recv_no", "822641048160MMJ");
+ map1.put("recv_no", "SR2024000006413");
// 手续费
BigDecimal bigDecimal = allMoney.multiply(new BigDecimal("0.038")).setScale(2, RoundingMode.HALF_UP);
payMoney = payMoney.subtract(bigDecimal);
@@ -422,7 +423,7 @@
@ApiOperation(value = "退款")
@PostMapping(value = "/refundOrder")
@SneakyThrows
- public R<?> refundOrder(@RequestParam String id, String type, HttpServletRequest request) {
+ public R<?> refundOrder(@RequestParam String id, HttpServletRequest request) {
SysUser user = tokenService.getLoginUser().getUser();
try {
// 先退分账 在退订单
@@ -471,7 +472,7 @@
// }
HashMap<String, Object> map1 = new HashMap<>();
// TODO hzt
- map1.put("recv_no", "dsadasda");
+ map1.put("recv_no", "SR2024000006413");
map1.put("amt", erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");
objects.add(map1);
map.put("total_amt",erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");
--
Gitblit v1.7.1