From 601e7ddfd4e8e6b51d12708c00783d13c7522e0e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 24 九月 2022 10:06:06 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 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..6a7a2e3 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
@@ -15,10 +15,10 @@
  */
 @Component
 public class UmfPayUtil {
-    @Value("${umf.file}")
-    private String file;
-    @Value("${umf.notify_url}")
-    private String notifyUrl;
+    //@Value("${umf.file}")
+    private String file="";
+    //@Value("${umf.notify_url}")
+    private String notifyUrl="";
     public Map pay(String orderid,String merdate,String openid,String amount){
         Map reqMapPublic = preparePublic(orderid,merdate,openid,amount,notifyUrl);
         UmfService instance = new UmfServiceImpl("53461",file);
@@ -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