From 63c985f072826e7c82f51b0f415454a066fd8c56 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 30 一月 2023 16:26:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 fdacd7e..b5a0092 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,11 +25,24 @@
Map respMap = instance.miniProgramPayMap(reqMapPublic);
return respMap;
}
+ public Map pay2(String orderid,String merdate,String openid,String amount){
+ Map reqMapPublic = preparePublic2(orderid,merdate,openid,amount,notifyUrl);
+ UmfService instance = new UmfServiceImpl("53461",file);
+ Map respMap = instance.miniProgramPayMap(reqMapPublic);
+ return respMap;
+ }
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;
+ }
+
+ public boolean settle(String settleDate){
+ Map reqMapPublic=prepareDownloadSettle(settleDate);
+ UmfService instance = new UmfServiceImpl("53461",file);
+ boolean bo=instance.reconciliationDownloadMap(reqMapPublic);
+ return bo;
}
@@ -40,11 +53,25 @@
Map reqMap = new HashMap();
reqMap.put("mer_id","53461");
reqMap.put("notify_url",notifyUrl);
- reqMap.put("goods_inf","商品描述");
+ reqMap.put("goods_inf","uu洗车服务");
reqMap.put("order_id",orderid);
reqMap.put("mer_date",merdate);
reqMap.put("amount",amount);
reqMap.put("app_id","wx118de8a734d269f0");
+ reqMap.put("open_id",openid);
+ reqMap.put("scancode_type","WECHAT");
+ return reqMap;
+ }
+ //小程序支付请求参数
+ public static Map preparePublic2(String orderid,String merdate,String openid,String amount,String notifyUrl) {
+ Map reqMap = new HashMap();
+ reqMap.put("mer_id","53461");
+ reqMap.put("notify_url",notifyUrl);
+ reqMap.put("goods_inf","无水洗车服务");
+ reqMap.put("order_id",orderid);
+ reqMap.put("mer_date",merdate);
+ reqMap.put("amount",amount);
+ reqMap.put("app_id","wx98d62711dfbd8425");
reqMap.put("open_id",openid);
reqMap.put("scancode_type","WECHAT");
return reqMap;
@@ -60,4 +87,12 @@
reqMap.put("org_amount",orgAmount);
return reqMap;
}
+
+ public static Map prepareDownloadSettle(String settleDate){
+ Map reqMap = new HashMap();
+ reqMap.put("mer_id","53461");
+ reqMap.put("settle_date",settleDate);//对账日期
+ reqMap.put("settle_path","D:/");//Windows下为---D:/tecent，Linux下为---/opt/tecent
+ return reqMap;
+ }
}
--
Gitblit v1.7.1