From 84e8c13e1885892631e52f71508150c0ff1ee55f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 25 九月 2025 18:52:01 +0800
Subject: [PATCH] 诊所erp
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..298f5b4 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);
@@ -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 {
// 先退分账 在退订单
@@ -486,7 +489,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- return R.fail(500, "调用支付宝支付预下单接口错误");
+ return R.fail(500, "退款失败请联系平台管理员");
}
--
Gitblit v1.7.1