mirror of
https://gitee.com/egzosn/pay-java-parent.git
synced 2026-06-04 07:36:30 +08:00
2.14.2
This commit is contained in:
@@ -47,7 +47,6 @@ import com.egzosn.pay.wx.v3.utils.WxConst;
|
||||
* date 2021/8/7
|
||||
*/
|
||||
public class DefaultWxPayAssistService implements WxPayAssistService {
|
||||
protected final Logger LOG = LoggerFactory.getLogger(getClass());
|
||||
private WxPayConfigStorage payConfigStorage;
|
||||
|
||||
private HttpRequestTemplate requestTemplate;
|
||||
@@ -118,6 +117,7 @@ public class DefaultWxPayAssistService implements WxPayAssistService {
|
||||
* 构建请求实体
|
||||
* 这里也做签名处理
|
||||
*
|
||||
* @param url url
|
||||
* @param body 请求内容体
|
||||
* @param method 请求方法
|
||||
* @return 请求实体
|
||||
|
||||
@@ -69,7 +69,6 @@ public class WxCombinePayService extends WxPayService {
|
||||
*
|
||||
* @param parameters 订单参数
|
||||
* @param order 订单信息
|
||||
* @return 订单参数
|
||||
*/
|
||||
public void initNotifyUrl(Map<String, Object> parameters, Order order) {
|
||||
OrderParaStructure.loadParameters(parameters, WxConst.NOTIFY_URL, payConfigStorage.getNotifyUrl());
|
||||
|
||||
@@ -52,7 +52,6 @@ public class WxParameterStructure {
|
||||
*
|
||||
* @param parameters 订单参数
|
||||
* @param order 支付订单
|
||||
* @return 订单参数
|
||||
*/
|
||||
public void loadSettleInfo(Map<String, Object> parameters, PayOrder order) {
|
||||
Object profitSharing = order.getAttr("profit_sharing");
|
||||
@@ -74,7 +73,6 @@ public class WxParameterStructure {
|
||||
*
|
||||
* @param parameters 订单参数
|
||||
* @param order 订单信息
|
||||
* @return 订单参数
|
||||
*/
|
||||
public void initNotifyUrl(Map<String, Object> parameters, Order order) {
|
||||
OrderParaStructure.loadParameters(parameters, WxConst.NOTIFY_URL, payConfigStorage.getNotifyUrl());
|
||||
@@ -95,7 +93,6 @@ public class WxParameterStructure {
|
||||
* 初始化商户相关信息
|
||||
*
|
||||
* @param parameters 参数信息
|
||||
* @return 参数信息
|
||||
*/
|
||||
public void initPartner(Map<String, Object> parameters) {
|
||||
if (null == parameters) {
|
||||
|
||||
@@ -53,6 +53,7 @@ public interface WxPayAssistService {
|
||||
* 构建请求实体
|
||||
* 这里也做签名处理
|
||||
*
|
||||
* @param url url
|
||||
* @param body 请求内容体
|
||||
* @param method 请求方法
|
||||
* @return 请求实体
|
||||
|
||||
@@ -8,8 +8,10 @@ import com.egzosn.pay.wx.v3.utils.WxConst;
|
||||
/**
|
||||
* 微信合单关闭订单
|
||||
* @author Egan
|
||||
* @email egan@egzosn.com
|
||||
* @date 2021/10/6
|
||||
* <pre>
|
||||
* email egan@egzosn.com
|
||||
* date 2021/10/6
|
||||
* </pre>
|
||||
*/
|
||||
public class CombineCloseOrder extends CloseOrder {
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@ public class WxPayMessage extends PayMessage {
|
||||
* 退款状态,枚举值:
|
||||
* SUCCESS:退款成功
|
||||
* CLOSE:退款关闭
|
||||
* ABNORMAL:退款异常,退款到银行发现用户的卡作废或者冻结了,导致原路退款银行卡失败,可前往【商户平台—>交易中心】,手动处理此笔退款
|
||||
* ABNORMAL: 退款异常,退款到银行发现用户的卡作废或者冻结了,导致原路退款银行卡失败,可前往【商户平台—交易中心】,手动处理此笔退款
|
||||
* 示例值:SUCCESS
|
||||
*/
|
||||
@JSONField(name = "refund_status")
|
||||
|
||||
@@ -7,8 +7,10 @@ import com.alibaba.fastjson.annotation.JSONField;
|
||||
/**
|
||||
* 优惠功能
|
||||
*
|
||||
* @author felord.cn
|
||||
* @since 1.0.0.RELEASE
|
||||
* <pre>
|
||||
* email egan@egzosn.com
|
||||
* date 2021/10/6
|
||||
* </pre>
|
||||
*/
|
||||
|
||||
public class PromotionDetail {
|
||||
|
||||
@@ -67,9 +67,10 @@ public final class AntCertificationUtil {
|
||||
|
||||
/**
|
||||
* 装载平台证书
|
||||
* @param serialNo 证书序列
|
||||
*
|
||||
* @param serialNo 证书序列
|
||||
* @param certificateStream 证书流
|
||||
* @return
|
||||
* @return 平台证书
|
||||
*/
|
||||
public static Certificate loadCertificate(String serialNo, InputStream certificateStream) {
|
||||
try {
|
||||
@@ -127,10 +128,12 @@ public final class AntCertificationUtil {
|
||||
/**
|
||||
* 解密响应体.
|
||||
*
|
||||
* @param associatedData 相关数据
|
||||
* @param nonce 随机串
|
||||
* @param cipherText 需要解密的文本
|
||||
* @return the string
|
||||
* @param associatedData 相关数据
|
||||
* @param nonce 随机串
|
||||
* @param cipherText 需要解密的文本
|
||||
* @param secretKey 密钥
|
||||
* @param characterEncoding 编码类型
|
||||
* @return 解密后的信息
|
||||
*/
|
||||
public static String decryptToString(String associatedData, String nonce, String cipherText, String secretKey, String characterEncoding) {
|
||||
|
||||
@@ -153,8 +156,7 @@ public final class AntCertificationUtil {
|
||||
*
|
||||
* @param message the message
|
||||
* @param certificate the certificate
|
||||
* @return encrypt message
|
||||
* @since 1.0.6.RELEASE
|
||||
* @return 加密后的内容
|
||||
*/
|
||||
public static String encryptToString(String message, Certificate certificate) {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user