From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 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 234c76d..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,20 +42,15 @@
 @Slf4j
 @Component
 public class UnifiedOrder {
-
-    @Value("${umf.notify_url}")
-    static String NOTIFYURL;
-
 //    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;
@@ -62,7 +58,7 @@
         reqBody.secureTransaction = "false";
         reqBody.orderDesc = orderDesc;
         reqBody.productId = productId;
-        reqBody.notifyUrl = "https://huacheng.psciio.com/api/huacheng-applets/wx/wxNotifyAll";
+        reqBody.notifyUrl = "https://huacheng.psciio.com/api/huacheng-applets/wx/wxNotifyAllUnionpay?merOrderId="+reqBody.merOrderId;
         reqBody.tradeType = "MINI";
         reqBody.subOpenId = OpenId;
 

--
Gitblit v1.7.1