From 0791bbd9b749d526b3168816abbd335ae8509f10 Mon Sep 17 00:00:00 2001 From: zaosheng Date: Mon, 16 Mar 2026 17:08:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E8=BD=AC=E8=B4=A6?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E7=95=99=E8=BD=AC=E8=B4=A6=E5=88=B0=E9=9B=B6?= =?UTF-8?q?=E9=92=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/egzosn/pay/ali/api/AliPayService.java | 69 +++++-------------- 1 file changed, 17 insertions(+), 52 deletions(-) diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java index 493a799..a28c685 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java @@ -1,50 +1,11 @@ package com.egzosn.pay.ali.api; -import java.util.Date; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.TreeMap; - -import static com.egzosn.pay.ali.bean.AliPayConst.ALIPAY_CERT_SN_FIELD; -import static com.egzosn.pay.ali.bean.AliPayConst.APP_AUTH_TOKEN; -import static com.egzosn.pay.ali.bean.AliPayConst.BIZ_CONTENT; -import static com.egzosn.pay.ali.bean.AliPayConst.CODE; -import static com.egzosn.pay.ali.bean.AliPayConst.DBACK_AMOUNT; -import static com.egzosn.pay.ali.bean.AliPayConst.HTTPS_REQ_URL; -import static com.egzosn.pay.ali.bean.AliPayConst.NOTIFY_URL; -import static com.egzosn.pay.ali.bean.AliPayConst.PASSBACK_PARAMS; -import static com.egzosn.pay.ali.bean.AliPayConst.PAYEE_INFO; -import static com.egzosn.pay.ali.bean.AliPayConst.PRODUCT_CODE; -import static com.egzosn.pay.ali.bean.AliPayConst.RETURN_URL; -import static com.egzosn.pay.ali.bean.AliPayConst.SIGN; -import static com.egzosn.pay.ali.bean.AliPayConst.SUCCESS_CODE; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.egzosn.pay.ali.bean.AliPayBillType; -import com.egzosn.pay.ali.bean.AliPayConst; -import com.egzosn.pay.ali.bean.AliPayMessage; -import com.egzosn.pay.ali.bean.AliRefundResult; -import com.egzosn.pay.ali.bean.AliTransactionType; -import com.egzosn.pay.ali.bean.AliTransferType; -import com.egzosn.pay.ali.bean.CertEnvironment; -import com.egzosn.pay.ali.bean.OrderSettle; +import com.egzosn.pay.ali.bean.*; import com.egzosn.pay.common.api.BasePayService; import com.egzosn.pay.common.api.TransferService; -import com.egzosn.pay.common.bean.AssistOrder; -import com.egzosn.pay.common.bean.BillType; -import com.egzosn.pay.common.bean.MethodType; -import com.egzosn.pay.common.bean.NoticeParams; -import com.egzosn.pay.common.bean.Order; -import com.egzosn.pay.common.bean.OrderParaStructure; -import com.egzosn.pay.common.bean.PayMessage; -import com.egzosn.pay.common.bean.PayOrder; -import com.egzosn.pay.common.bean.PayOutMessage; -import com.egzosn.pay.common.bean.RefundOrder; -import com.egzosn.pay.common.bean.TransactionType; -import com.egzosn.pay.common.bean.TransferOrder; -import com.egzosn.pay.common.bean.TransferType; +import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.bean.result.PayException; import com.egzosn.pay.common.exception.PayErrorException; import com.egzosn.pay.common.http.HttpConfigStorage; @@ -55,6 +16,10 @@ import com.egzosn.pay.common.util.sign.SignTextUtils; import com.egzosn.pay.common.util.sign.SignUtils; import com.egzosn.pay.common.util.str.StringUtils; +import java.util.*; + +import static com.egzosn.pay.ali.bean.AliPayConst.*; + /** * 支付宝支付服务 * @@ -66,7 +31,6 @@ import com.egzosn.pay.common.util.str.StringUtils; public class AliPayService extends BasePayService implements TransferService, AliPayServiceInf { - /** * api服务地址，默认为国内 */ @@ -355,8 +319,7 @@ public class AliPayService extends BasePayService implement method = "msg_method"; orderInfo.put("utc_timestamp", System.currentTimeMillis()); version = "1.1"; - } - else { + } else { orderInfo.put("timestamp", DateUtils.format(new Date())); } @@ -409,8 +372,7 @@ public class AliPayService extends BasePayService implement public String toPay(PayOrder order) { if (null == order.getTransactionType()) { order.setTransactionType(AliTransactionType.PAGE); - } - else if (order.getTransactionType() != AliTransactionType.PAGE && order.getTransactionType() != AliTransactionType.WAP) { + } else if (order.getTransactionType() != AliTransactionType.PAGE && order.getTransactionType() != AliTransactionType.WAP) { throw new PayErrorException(new PayException("-1", "错误的交易类型:" + order.getTransactionType())); } return super.toPay(order); @@ -491,8 +453,7 @@ public class AliPayService extends BasePayService implement public Map microPay(PayOrder order) { if (null == order.getTransactionType()) { order.setTransactionType(AliTransactionType.BAR_CODE); - } - else if (order.getTransactionType() != AliTransactionType.BAR_CODE && order.getTransactionType() != AliTransactionType.WAVE_CODE && order.getTransactionType() != AliTransactionType.SECURITY_CODE) { + } else if (order.getTransactionType() != AliTransactionType.BAR_CODE && order.getTransactionType() != AliTransactionType.WAVE_CODE && order.getTransactionType() != AliTransactionType.SECURITY_CODE) { throw new PayErrorException(new PayException("-1", "错误的交易类型:" + order.getTransactionType())); } @@ -765,16 +726,21 @@ public class AliPayService extends BasePayService implement //获取公共参数 Map parameters = getPublicParameters(transferType); setAppAuthToken(parameters, order.getAttrs()); - Map bizContent = new LinkedHashMap(); bizContent.put("out_biz_no", order.getOutNo()); bizContent.put("trans_amount", order.getAmount()); transferType.setAttr(bizContent, order); - OrderParaStructure.loadParameters(bizContent, "order_title", order); + if (StringUtils.isNotEmpty(order.getRemark())) { + bizContent.put("order_title", order.getRemark()); + } else { + OrderParaStructure.loadParameters(bizContent, "order_title", order); + } + OrderParaStructure.loadParameters(bizContent, "biz_scene", order); OrderParaStructure.loadParameters(bizContent, "original_order_id", order); setPayeeInfo(bizContent, order); bizContent.put("remark", order.getRemark()); OrderParaStructure.loadParameters(bizContent, "business_params", order); + OrderParaStructure.loadParameters(bizContent, "transfer_scene_report_infos", order); //设置请求参数的集合 parameters.put(BIZ_CONTENT, JSON.toJSONString(bizContent)); @@ -797,8 +763,7 @@ public class AliPayService extends BasePayService implement Map bizContent = new TreeMap(); if (StringUtils.isEmpty(assistOrder.getOutTradeNo())) { bizContent.put("order_id", assistOrder.getTradeNo()); - } - else { + } else { bizContent.put("out_biz_no", assistOrder.getOutTradeNo()); } //设置请求参数的集合