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

binarywang · binarywang · commit f58ba62acc24 · 2020-03-08T20:15:36.000+08:00
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -4,9 +4,11 @@
 import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
 import lombok.*;
 import lombok.experimental.Accessors;
 import me.chanjar.weixin.common.annotation.Required;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
@@ -111,6 +113,7 @@ public class WxPayUnifiedOrderRequest extends BaseWxPayRequest {
    * </pre>
    */
   @XStreamAlias("detail")
+  @XStreamConverter(value = XStreamCDataConverter.class)
   private String detail;
 
   /**
@@ -124,6 +127,7 @@ public class WxPayUnifiedOrderRequest extends BaseWxPayRequest {
    * </pre>
    */
   @XStreamAlias("attach")
+  @XStreamConverter(value = XStreamCDataConverter.class)
   private String attach;
 
   /**
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -63,12 +63,13 @@ public void testUnifiedOrder() throws WxPayException {
       .notifyUrl("111111")
       .tradeType(TradeType.JSAPI)
       .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())
-      .outTradeNo("1111112")
+      .outTradeNo("111111826")
+      .attach("#*#{\"pn\":\"粤B87965\",\"aid\":\"wx123\"}#*#")
       .build();
     request.setSignType(SignType.HMAC_SHA256);
     WxPayUnifiedOrderResult result = this.payService.unifiedOrder(request);
     log.info(result.toString());
-    log.warn(this.payService.getWxApiData().toString());
+//    log.warn(this.payService.getWxApiData().toString());
   }
 
   /**
