diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java index bd3fc2b..fc0769e 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java @@ -165,7 +165,7 @@ public class AliPayService extends BasePayService { orderInfo.put("notify_url", payConfigStorage.getNotifyUrl()); Map bizContent = new TreeMap<>(); - if ("alipay.trade.pay".equals(order.getTransactionType().getType())){ + if ("alipay.trade.pay".equals(order.getTransactionType().getMethod())){ bizContent.put("scene", order.getTransactionType().toString().toLowerCase()); bizContent.put("product_code", "FACE_TO_FACE_PAYMENT"); bizContent.put("auth_code", order.getAuthCode()); @@ -189,7 +189,7 @@ public class AliPayService extends BasePayService { private Map getPublicParameters(TransactionType transactionType ){ Map orderInfo = new TreeMap<>(); orderInfo.put("app_id", payConfigStorage.getAppid()); - orderInfo.put("method", transactionType.getType()); + orderInfo.put("method", transactionType.getMethod()); orderInfo.put("charset", payConfigStorage.getInputCharset()); DateFormat formatter = DateFormat.getDateTimeInstance(); orderInfo.put("timestamp", formatter.format( new Date())); diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/bean/AliTransactionType.java b/pay-java-ali/src/main/java/in/egan/pay/ali/bean/AliTransactionType.java index 4d3feae..1b2d934 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/bean/AliTransactionType.java +++ b/pay-java-ali/src/main/java/in/egan/pay/ali/bean/AliTransactionType.java @@ -32,14 +32,24 @@ public enum AliTransactionType implements TransactionType { - private String type; + private String method; - private AliTransactionType(String type) { - this.type = type; + private AliTransactionType(String method) { + this.method = method; } @Override public String getType() { - return type; + return this.name(); } + + /** + * 获取接口名称 + * @return + */ + @Override + public String getMethod() { + return this.method; + } + } diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/before/api/AliPayService.java b/pay-java-ali/src/main/java/in/egan/pay/ali/before/api/AliPayService.java index 355d273..55f6f8c 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/before/api/AliPayService.java +++ b/pay-java-ali/src/main/java/in/egan/pay/ali/before/api/AliPayService.java @@ -114,7 +114,7 @@ public class AliPayService extends BasePayService { private Map getPublicParameters(TransactionType transactionType ){ Map orderInfo = new TreeMap<>(); orderInfo.put("app_id", payConfigStorage.getAppid()); - orderInfo.put("method", transactionType.getType()); + orderInfo.put("method", transactionType.getMethod()); orderInfo.put("format", "json"); orderInfo.put("charset", payConfigStorage.getInputCharset()); @@ -166,7 +166,7 @@ public class AliPayService extends BasePayService { // 签约卖家支付宝账号 orderInfo.put("seller_id", payConfigStorage.getSeller()); // 商户网站唯一订单号 - orderInfo.put("out_trade_no", order.getTradeNo()); + orderInfo.put("out_trade_no", order.getOutTradeNo()); // 商品名称 orderInfo.put("subject", order.getSubject()); // 商品详情 @@ -176,7 +176,7 @@ public class AliPayService extends BasePayService { // 服务器异步通知页面路径 orderInfo.put("notify_url", payConfigStorage.getNotifyUrl() ); // 服务接口名称, 固定值 - orderInfo.put("service", order.getTransactionType().getType() ); + orderInfo.put("service", order.getTransactionType().getMethod() ); // 支付类型, 固定值 orderInfo.put("payment_type", "1" ); // 参数编码, 固定值 diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/before/bean/AliTransactionType.java b/pay-java-ali/src/main/java/in/egan/pay/ali/before/bean/AliTransactionType.java index cc2bd1d..a4f75dd 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/before/bean/AliTransactionType.java +++ b/pay-java-ali/src/main/java/in/egan/pay/ali/before/bean/AliTransactionType.java @@ -29,14 +29,23 @@ public enum AliTransactionType implements TransactionType { ,UNAWARE("UNAWARE") ; - private String type; + private String method; - private AliTransactionType(String type) { - this.type = type; + private AliTransactionType(String method) { + this.method = method; } @Override public String getType() { - return type; + return this.name(); + } + + /** + * 获取接口名称 + * @return + */ + @Override + public String getMethod() { + return this.method; } } diff --git a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouTransactionType.java b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouTransactionType.java index 6234211..105cfcf 100644 --- a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouTransactionType.java +++ b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouTransactionType.java @@ -9,12 +9,27 @@ import in.egan.pay.common.bean.TransactionType; * @date 2016/10/19 22:58 */ public enum FuiouTransactionType implements TransactionType { - B2B, - B2C + B2B(""), + B2C("") ; + private String method; + + private FuiouTransactionType(String method) { + this.method = method; + } + @Override public String getType() { return this.name(); } + + /** + * 获取接口名称 + * @return + */ + @Override + public String getMethod() { + return this.method; + } } diff --git a/pay-java-wx-youdian/src/main/java/in/egan/pay/wx/youdian/bean/YoudianTransactionType.java b/pay-java-wx-youdian/src/main/java/in/egan/pay/wx/youdian/bean/YoudianTransactionType.java index 2e74164..f92f79e 100644 --- a/pay-java-wx-youdian/src/main/java/in/egan/pay/wx/youdian/bean/YoudianTransactionType.java +++ b/pay-java-wx-youdian/src/main/java/in/egan/pay/wx/youdian/bean/YoudianTransactionType.java @@ -11,12 +11,27 @@ import in.egan.pay.common.bean.TransactionType; public enum YoudianTransactionType implements TransactionType { //扫码付 - NATIVE, + NATIVE("unifiedorder"), //刷卡付 - MICROPAY;//暂未接触 + MICROPAY("micropay");//暂未接触 + + private String method; + + private YoudianTransactionType(String method) { + this.method = method; + } @Override public String getType() { return this.name(); } + + /** + * 获取接口名称 + * @return + */ + @Override + public String getMethod() { + return this.method; + } }