Browse Source

🎨 #1428 微信支付统一下单接口中的attach和detail参数在生成xml时加入CDATA标签

dev1
Binary Wang 5 years ago
parent
commit
f58ba62acc
2 changed files with 7 additions and 2 deletions
  1. +4
    -0
      weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
  2. +3
    -2
      weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java

+ 4
- 0
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java View File

@@ -4,9 +4,11 @@ import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType; import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType;
import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.exception.WxPayException;
import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import me.chanjar.weixin.common.annotation.Required; import me.chanjar.weixin.common.annotation.Required;
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;


import java.util.Map; import java.util.Map;
@@ -111,6 +113,7 @@ public class WxPayUnifiedOrderRequest extends BaseWxPayRequest {
* </pre> * </pre>
*/ */
@XStreamAlias("detail") @XStreamAlias("detail")
@XStreamConverter(value = XStreamCDataConverter.class)
private String detail; private String detail;


/** /**
@@ -124,6 +127,7 @@ public class WxPayUnifiedOrderRequest extends BaseWxPayRequest {
* </pre> * </pre>
*/ */
@XStreamAlias("attach") @XStreamAlias("attach")
@XStreamConverter(value = XStreamCDataConverter.class)
private String attach; private String attach;


/** /**


+ 3
- 2
weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java View File

@@ -63,12 +63,13 @@ public class BaseWxPayServiceImplTest {
.notifyUrl("111111") .notifyUrl("111111")
.tradeType(TradeType.JSAPI) .tradeType(TradeType.JSAPI)
.openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid()) .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())
.outTradeNo("1111112")
.outTradeNo("111111826")
.attach("#*#{\"pn\":\"粤B87965\",\"aid\":\"wx123\"}#*#")
.build(); .build();
request.setSignType(SignType.HMAC_SHA256); request.setSignType(SignType.HMAC_SHA256);
WxPayUnifiedOrderResult result = this.payService.unifiedOrder(request); WxPayUnifiedOrderResult result = this.payService.unifiedOrder(request);
log.info(result.toString()); log.info(result.toString());
log.warn(this.payService.getWxApiData().toString());
// log.warn(this.payService.getWxApiData().toString());
} }


/** /**


Loading…
Cancel
Save