From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 66e7184..223db89 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
@@ -126,6 +126,10 @@
String amount = String.valueOf(erpProcurement.getPayMoney().multiply(new BigDecimal("100")).intValue());
TCrmSupplier supplier = crmSupplierService.getById(erpProcurement.getSupplierId());
+ String trans_type ="41";
+ if("WECHAT".equals(type)){
+ trans_type= "51";
+ }
String apiPath = "sit/api/v3/labs/trans/preorder";
@@ -144,7 +148,7 @@
"\t\t\"settle_type\": \"1\",\n" +
"\t\t\"total_amount\": " + amount + ",\n" +
"\t\t\"account_type\": \"" + type + "\",\n" +
- "\t\t\"trans_type\": \"41\"\n" +
+ "\t\t\"trans_type\": \""+trans_type+"\"\n" +
"\t}\n" +
"}";
String authorization = getAuthorization(body);
@@ -164,7 +168,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);
@@ -257,7 +261,7 @@
}
HashMap<String, Object> map1 = new HashMap<>();
//TODO hzt
- map1.put("recv_no", "822641048160MMJ");
+ map1.put("recv_no", "SR2024000144253");
// 手续费
BigDecimal bigDecimal = allMoney.multiply(new BigDecimal("0.038")).setScale(2, RoundingMode.HALF_UP);
payMoney = payMoney.subtract(bigDecimal);
@@ -409,7 +413,6 @@
return jsonObject;
}
}
-
return null;
}
@@ -419,7 +422,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 {
// 先退分账 在退订单
@@ -468,7 +471,7 @@
// }
HashMap<String, Object> map1 = new HashMap<>();
// TODO hzt
- map1.put("recv_no", "dsadasda");
+ 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() + "");
@@ -486,7 +489,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- return R.fail(500, "调用支付宝支付预下单接口错误");
+ return R.fail(500, "退款失败请联系平台管理员");
}
--
Gitblit v1.7.1