From fe1a0613d48e9b76b474d22073e72feda23b0d5c Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期六, 17 九月 2022 18:57:13 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java |   17 ++++++++++++++++-
 1 files changed, 16 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..12c8ec9 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
@@ -32,6 +32,13 @@
         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,7 +47,7 @@
         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);
@@ -60,4 +67,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