From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java
index c0ab46b..797eff6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java
@@ -1,5 +1,6 @@
 package com.panzhihua.applets.unionpay;
 
+import com.panzhihua.common.service.community.CommunityService;
 import com.panzhihua.common.utlis.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
@@ -41,18 +42,15 @@
 @Slf4j
 @Component
 public class UnifiedOrder {
-
-
 //    static String url = "https://test-api-open.chinaums.com/v1/netpay/wx/unified-order";
     static String url = "https://api-mop.chinaums.com/v1/netpay/wx/unified-order";
 
-    public static String sendOrder(String totalAmount,String orderDesc,String productId,String OpenId)
+    public static String sendOrder(String totalAmount,String orderDesc,String productId,String OpenId,LocalDateTime time,String merOrderId)
     {
         //1. 组建请求报文
-        LocalDateTime time=DateUtils.getCurrentDate();
         UnifiedOrderBody reqBody = new UnifiedOrderBody();
         reqBody.requestTimestamp = time.format(DateUtils.format_ymdhms);// "2019-08-09 17:30:55";
-        reqBody.merOrderId = UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
+        reqBody.merOrderId = merOrderId;
         reqBody.mid = UnionpayContent.MID;
         reqBody.tid = UnionpayContent.TID;
         reqBody.instMid = UnionpayContent.INSTMID;

--
Gitblit v1.7.1