修改bug

puzhibing

2025-01-13 acccff9860b271d55c55dc87486f7c20b9896e6c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/payment/PaymentUtil.java

@@ -1,12 +1,12 @@
package com.ruoyi.order.util.payment;

import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import cn.hutool.http.*;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.util.payment.model.*;
import lombok.extern.slf4j.Slf4j;

import java.util.*;

/**
@@ -28,6 +28,10 @@
    */
   private static final String merchantNo = "888122600004175";
   /**
    * 平台-报备商户号
    */
   private static final String sysTradeMerchantNo = "777168500885852";
   /**
    * 支付回调地址
    */
   private static final String callbackUrl = "http://221.182.45.100:9000";
@@ -48,6 +52,7 @@
   public static UniPayResult uniPay(String orderNo, Double amount, String productName, String productDesc, String mp, String notifyUrl, String openId, String tradeMerchantNo){
      String url = "https://trade.joinpay.com/tradeRt/uniPay";
      HttpRequest post = HttpUtil.createPost(url);
      post.header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded");
      JSONObject body = new JSONObject();
      //版本号
      body.put("p0_Version", "2.5");
@@ -74,7 +79,7 @@
      //APPID
      body.put("q7_AppId", appId);
      //报备商户号
      body.put("qa_TradeMerchantNo", tradeMerchantNo);
      body.put("qa_TradeMerchantNo", StringUtils.isNotEmpty(tradeMerchantNo) ? tradeMerchantNo : sysTradeMerchantNo);
      String sign = null;
      try {
         sign = sign(body);
@@ -82,7 +87,7 @@
         throw new RuntimeException(e);
      }
      body.put("hmac", sign);
      post.body(body.toString());
      post.form(body);
      log.info("支付接口请求参数：" + body);
      HttpResponse execute = post.execute();
      log.info("支付接口请求响应：" + execute.body());
@@ -103,6 +108,7 @@
   public static QueryOrderResult queryOrder(String orderNo){
      String url = "https://trade.joinpay.com/tradeRt/queryOrder";
      HttpRequest post = HttpUtil.createPost(url);
      post.header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded");
      JSONObject body = new JSONObject();
      //版本号
      body.put("p0_Version", "2.5");
@@ -117,7 +123,7 @@
         throw new RuntimeException(e);
      }
      body.put("hmac", sign);
      post.body(body.toString());
      post.form(body);
      log.info("查询支付接口请求参数：" + body);
      HttpResponse execute = post.execute();
      log.info("查询支付接口请求响应：" + execute.body());
@@ -141,6 +147,7 @@
   public static RefundResult refund(String orderNo, String refundOrderNo, Double refundAmount, String notifyUrl){
      String url = "https://trade.joinpay.com/tradeRt/refund";
      HttpRequest post = HttpUtil.createPost(url);
      post.header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded");
      JSONObject body = new JSONObject();
      //版本号
      body.put("p0_Version", "2.3");
@@ -153,7 +160,7 @@
      //退款金额
      body.put("p4_RefundAmount", refundAmount);
      //服务器异步通知地址
      body.put("p6_NotifyUrl", notifyUrl);
      body.put("p6_NotifyUrl", callbackUrl + notifyUrl);
      String sign = null;
      try {
         sign = sign(body);
@@ -161,7 +168,7 @@
         throw new RuntimeException(e);
      }
      body.put("hmac", sign);
      post.body(body.toString());
      post.form(body);
      log.info("退款接口请求参数：" + body);
      HttpResponse execute = post.execute();
      log.info("退款接口请求响应：" + execute.body());
@@ -182,6 +189,7 @@
   public static QueryRefundResult queryRefund(String refundOrderNo){
      String url = "https://trade.joinpay.com/tradeRt/refund";
      HttpRequest post = HttpUtil.createPost(url);
      post.header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded");
      JSONObject body = new JSONObject();
      //版本号
      body.put("p0_Version", "2.3");
@@ -196,7 +204,7 @@
         throw new RuntimeException(e);
      }
      body.put("hmac", sign);
      post.body(body.toString());
      post.form(body);
      log.info("退款接口请求参数：" + body);
      HttpResponse execute = post.execute();
      log.info("退款接口请求响应：" + execute.body());
@@ -217,6 +225,7 @@
   public static CloseOrderResult closeOrder(String orderNo){
      String url = "https://www.joinpay.com/trade/closeOrder.action";
      HttpRequest post = HttpUtil.createPost(url);
      post.header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded");
      JSONObject body = new JSONObject();
      //商户编号
      body.put("p1_MerchantNo", merchantNo);
@@ -231,7 +240,7 @@
         throw new RuntimeException(e);
      }
      body.put("hmac", sign);
      post.body(body.toString());
      post.form(body);
      log.info("关闭订单接口请求参数：" + body);
      HttpResponse execute = post.execute();
      log.info("关闭订单接口请求响应：" + execute.body());
@@ -245,13 +254,13 @@
   
   
   
   public static String sign(JSONObject body) throws Exception{
   public static String sign(JSONObject body) {
      Set<Map.Entry<String, Object>> entries = body.entrySet();
      List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
      // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
      Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
         public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
            return (o1.getKey()).toString().compareTo(o2.getKey());
            return (o1.getKey()).compareTo(o2.getKey());
         }
      });
      // 构造签名键值对的格式
@@ -265,12 +274,16 @@
         }
      }
      sb.append(key);
      log.info("待签名串：{}", sb.toString());
      return MD5AndKL.MD5(sb.toString());
   }
   
   
   public static void main(String[] args) {
      UniPayResult uniPayResult = PaymentUtil.uniPay("123456", 0.01D, "测试商品", "这是用于对接支付测试的商品描述", "", "", "", "");
      System.err.println(JSON.toJSONString(uniPayResult));
//      UniPayResult uniPayResult = PaymentUtil.uniPay("852963742", 0.01D, "测试商品", "这是用于对接支付测试的商品描述",
//            "", "/order/shopping-cart/shoppingCartPaymentCallback", "ooOrs64zHLuInkZ_GF0LpIN9_Rxc", "777168500885852");
//      PaymentUtil.queryOrder("852963742");
//      PaymentUtil.closeOrder("852963742");
		
   }
}