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 b01628e..f49ce24 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 @@ -179,10 +179,12 @@ public class AliPayService extends BasePayService { switch ((AliTransactionType) order.getTransactionType()) { case PAGE: case DIRECT: + bizContent.put("passback_params", order.getAddition()); bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY"); orderInfo.put("return_url", payConfigStorage.getReturnUrl()); break; case WAP: + bizContent.put("passback_params", order.getAddition()); bizContent.put("product_code", "QUICK_WAP_PAY"); orderInfo.put("return_url", payConfigStorage.getReturnUrl()); break; diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java index f295d8c..8e354fb 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java @@ -13,33 +13,68 @@ import java.util.Date; * */ public class PayOrder { - //商品名称 + /** + * 商品名称 + */ private String subject; - //商品描述 + /** + * 商品描述 + */ private String body; - //价格 + /** + * 商品描述 + */ + private String addition; + /** + * 价格 + */ private BigDecimal price; - //商户订单号 + /** + * 商户订单号 + */ private String outTradeNo; - //银行卡类型 + /** + * 银行卡类型 + */ private String bankType; - //设备信息, + /** + * 设备信息 + */ private String deviceInfo; - //支付创建ip + /** + * 支付创建ip + */ private String spbillCreateIp; - //付款条码串 与设备号类似??? + /** + * 付款条码串 与设备号类似??? + */ private String authCode; - //WAP支付链接 + /** + * 微信专用,,,, + * WAP支付链接 + */ private String wapUrl; - //WAP支付网页名称 + /** + * 微信专用,,,, + * WAP支付网页名称 + */ + private String wapName; - //微信会员唯一标识 + /** + * 微信会员唯一标识 + */ private String openid; - //交易类型 + /** + * 交易类型 + */ private TransactionType transactionType; - //支付币种 + /** + * 支付币种 + */ private CurType curType; - //订单过期时间 + /** + * 订单过期时间 + */ private Date expirationTime; @@ -69,6 +104,14 @@ public class PayOrder { this.body = body; } + public String getAddition() { + return addition; + } + + public void setAddition(String addition) { + this.addition = addition; + } + public BigDecimal getPrice() { return price; } diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index 141f3cf..6b57180 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -194,11 +194,13 @@ public class WxPayService extends BasePayService { Map parameters = getPublicParameters(); parameters.put("body", order.getSubject());// 购买支付信息 +// parameters.put("detail", order.getBody());// 购买支付信息 parameters.put("out_trade_no", order.getOutTradeNo());// 订单号 parameters.put("spbill_create_ip", StringUtils.isEmpty(order.getSpbillCreateIp()) ? "192.168.1.150" : order.getSpbillCreateIp() ); parameters.put("total_fee", conversion( order.getPrice()));// 总金额单位为分 - - parameters.put("attach", order.getBody()); + if (StringUtils.isNotEmpty(order.getAddition())){ + parameters.put("attach", order.getAddition()); + } parameters.put("notify_url", payConfigStorage.getNotifyUrl()); parameters.put("trade_type", order.getTransactionType().getType()); if (null != order.getExpirationTime()){