From 61fe9dde69655e9fe9490b79e364f7d1d3eb147f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 24 六月 2022 13:25:31 +0800
Subject: [PATCH] Merge branch 'huacheng_uu' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java
index a7e3381..fdacd7e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java
@@ -25,8 +25,8 @@
Map respMap = instance.miniProgramPayMap(reqMapPublic);
return respMap;
}
- public Map repay(String orderid,String merdate,String amount,String refundNo,String refundAmount,String orgAmount){
- Map reqMapPublic=prepareRepay(orderid,merdate,amount,refundNo,refundAmount,orgAmount);
+ public Map repay(String orderid,String merdate,String refundNo,String refundAmount,String orgAmount){
+ Map reqMapPublic=prepareRepay(orderid,merdate,refundNo,refundAmount,orgAmount);
UmfService instance = new UmfServiceImpl("53461",file);
Map respMap=instance.generalRefundMap(reqMapPublic);
return respMap;
@@ -50,12 +50,11 @@
return reqMap;
}
//小程序支付请求参数
- public static Map prepareRepay(String orderid,String merdate,String amount,String refundNo,String refundAmount,String orgAmount) {
+ public static Map prepareRepay(String orderid,String merdate,String refundNo,String refundAmount,String orgAmount) {
Map reqMap = new HashMap();
reqMap.put("mer_id","53461");
reqMap.put("order_id",orderid);
reqMap.put("mer_date",merdate);
- reqMap.put("amount",amount);
reqMap.put("refund_no",refundNo);
reqMap.put("refund_amount",refundAmount);
reqMap.put("org_amount",orgAmount);
--
Gitblit v1.7.1