From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/HuiFuTianXiaUtil.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/HuiFuTianXiaUtil.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/HuiFuTianXiaUtil.java
index aa454b9..863cafc 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/HuiFuTianXiaUtil.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/HuiFuTianXiaUtil.java
@@ -68,7 +68,7 @@
     //微信小程序appid
     private static String sub_appid = "wxb7f0ea286fc4e535";
     //本地文件存储位置
-    private static String path = "/home/hongruitang/shop/flies";
+    private static String path = "/opt/flies";
     //接口文档https://paas.huifu.com/partners/api/#/
 
 
@@ -422,7 +422,7 @@
 //        data.put("mer_icp", dto.getMerIcp());
         data.put("mer_icp", "");
         data.put("open_licence_no", dto.getOpenLicenceNo());
-        data.put("head_huifu_id", huifu_id);
+//        data.put("head_huifu_id", huifu_id);
         R<String> r = supplementaryPicture(dto.getRegAcctPic(), IdUtils.simpleUUID(), "F08");
         if(r.getCode() == 200){
             data.put("reg_acct_pic", r.getData());
@@ -1216,6 +1216,7 @@
         headers.put("Accept", "application/json");
         post.addHeaders(headers);
         post.body(body.toJSONString());
+        System.err.println("分账报文:\n" + body.toJSONString());
         HttpResponse execute = post.execute();
         String result = execute.body();
         execute.close();
@@ -1250,7 +1251,7 @@
     }
 
     public static void main(String[] args) {
-        R<List<MerchantBasicdataSettlementVo>> merchantBasicdataSettlement = HuiFuTianXiaUtil.getMerchantBasicdataSettlement(IdUtils.simpleUUID(), "6666000141606205", "20231110", "20231116", "1", "10");
+        R<List<MerchantBasicdataSettlementVo>> merchantBasicdataSettlement = HuiFuTianXiaUtil.getMerchantBasicdataSettlement(IdUtils.simpleUUID(), "6666000143736815", "20231123", "20231130", "1", "10");
         System.err.println(JSON.toJSONString(merchantBasicdataSettlement));
     }
 }

--
Gitblit v1.7.1