🎨 优化部分代码

binarywang · binarywang · commit 59d8cc6d577d · 2021-03-30T20:33:41.000+08:00
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImplTest.java
@@ -1,6 +1,7 @@
 package cn.binarywang.wx.miniapp.api.impl;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import me.chanjar.weixin.common.bean.subscribemsg.CategoryData;
 import me.chanjar.weixin.common.bean.subscribemsg.PubTemplateKeyword;
 import me.chanjar.weixin.common.bean.subscribemsg.TemplateInfo;
@@ -64,4 +65,10 @@ public void testGetCategory() throws WxErrorException {
     assertThat(categoryData).isNotNull();
     System.out.println(categoryData);
   }
+
+  @Test
+  public void testSendSubscribeMsg() throws WxErrorException {
+    // TODO 待完善补充
+    this.wxService.getSubscribeService().sendSubscribeMsg(WxMaSubscribeMessage.builder().build());
+  }
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpSubscribeMsgServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpSubscribeMsgServiceImplTest.java
@@ -76,4 +76,8 @@ public void testGetCategory() {
   @Test
   public void testSend() {
   }
+
+  @Test
+  public void testSendOnce() {
+  }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * 查询代金券信息响应结果类
@@ -19,7 +21,9 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class WxPayCouponInfoQueryResult extends BaseWxPayResult {
+public class WxPayCouponInfoQueryResult extends BaseWxPayResult implements Serializable {
+  private static final long serialVersionUID = -8328629147291321829L;
+
   /**
    * <pre>
    * 字段名：设备号.
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * 发送代金券响应结果类
@@ -19,7 +21,9 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class WxPayCouponSendResult extends BaseWxPayResult {
+public class WxPayCouponSendResult extends BaseWxPayResult implements Serializable {
+  private static final long serialVersionUID = -3596288305333090962L;
+
   /**
    * <pre>
    * 字段名：设备号
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java
@@ -8,6 +8,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * 查询代金券批次响应结果类.
@@ -21,7 +23,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @XStreamAlias("xml")
-public class WxPayCouponStockQueryResult extends BaseWxPayResult {
+public class WxPayCouponStockQueryResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 4644274730788451926L;
   /**
    * <pre>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankQueryResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * 企业付款到银行卡查询返回结果.
@@ -19,7 +21,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class EntPayBankQueryResult extends BaseWxPayResult {
+public class EntPayBankQueryResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = -8336631015989500746L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayBankResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * 企业付款到银行卡的响应结果.
@@ -19,7 +21,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class EntPayBankResult extends BaseWxPayResult {
+public class EntPayBankResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 3449707749935227689L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayQueryResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * 企业付款查询返回结果.
@@ -19,7 +21,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class EntPayQueryResult extends BaseWxPayResult {
+public class EntPayQueryResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 3948485732447456947L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackQueryResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * 红包发送记录查询返回
  *
@@ -17,7 +19,8 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class EntPayRedpackQueryResult extends BaseWxPayResult {
+public class EntPayRedpackQueryResult extends BaseWxPayResult implements Serializable {
+  private static final long serialVersionUID = 3127509905347445197L;
 
   /**
    * 商户订单号
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayRedpackResult.java
@@ -20,7 +20,6 @@
 @NoArgsConstructor
 @XStreamAlias("xml")
 public class EntPayRedpackResult extends BaseWxPayResult implements Serializable {
-
   private static final long serialVersionUID = 1L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * 企业付款返回结果
@@ -19,7 +21,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class EntPayResult extends BaseWxPayResult {
+public class EntPayResult extends BaseWxPayResult  implements Serializable {
   private static final long serialVersionUID = 8523569987269603097L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/GetPublicKeyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/GetPublicKeyResult.java
@@ -6,6 +6,8 @@
 import lombok.EqualsAndHashCode;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  *  企业付款获取RSA加密公钥接口返回结果类
@@ -17,7 +19,9 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @XStreamAlias("xml")
-public class GetPublicKeyResult extends BaseWxPayResult {
+public class GetPublicKeyResult extends BaseWxPayResult  implements Serializable {
+  private static final long serialVersionUID = -9150517427082709997L;
+
   /**
    * 商户号.
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java
@@ -15,6 +15,7 @@
 import me.chanjar.weixin.common.util.xml.XStreamInitializer;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +32,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class WxPayOrderNotifyResult extends BaseWxPayResult {
+public class WxPayOrderNotifyResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 5389718115223345496L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * 扫码支付通知回调类.
@@ -19,7 +21,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class WxScanPayNotifyResult extends BaseWxPayResult {
+public class WxScanPayNotifyResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 3381324564266118986L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingMerchantRatioQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingMerchantRatioQueryResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * @author : cofedream
  * @date : 2020-12-28
@@ -15,7 +17,9 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class ProfitSharingMerchantRatioQueryResult extends BaseWxPayResult {
+public class ProfitSharingMerchantRatioQueryResult extends BaseWxPayResult implements Serializable {
+  private static final long serialVersionUID = 7556620112016338659L;
+
   /**
    * 服务商模式下的子商户号.<br/>
    * 2000<br/>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingOrderAmountQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingOrderAmountQueryResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * @author : cofedream
  * @date : 2020-12-29
@@ -15,7 +17,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class ProfitSharingOrderAmountQueryResult extends BaseWxPayResult {
+public class ProfitSharingOrderAmountQueryResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 7355605400662796198L;
   /**
    * 微信订单号.
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java
@@ -11,6 +11,7 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -21,7 +22,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class ProfitSharingQueryResult extends BaseWxPayResult {
+public class ProfitSharingQueryResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 2548673608075775067L;
   /**
    * 微信订单号
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReceiverResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReceiverResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * @author Wang GuangXin 2019/10/22 14:54
  * @version 1.0
@@ -15,7 +17,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class ProfitSharingReceiverResult extends BaseWxPayResult {
+public class ProfitSharingReceiverResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 876204163877798066L;
   /**
    * 分账接收方.
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * @author Wang GuangXin 2019/10/22 10:06
  * @version 1.0
@@ -15,7 +17,9 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class ProfitSharingResult extends BaseWxPayResult {
+public class ProfitSharingResult extends BaseWxPayResult implements Serializable {
+  private static final long serialVersionUID = 7435709584788869456L;
+
   /**
    * 微信订单号.
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReturnResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingReturnResult.java
@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+
 /**
  * @author Wang GuangXin 2019/10/23 14:41
  * @version 1.0
@@ -15,7 +17,7 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @XStreamAlias("xml")
-public class ProfitSharingReturnResult extends BaseWxPayResult {
+public class ProfitSharingReturnResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 718554909816994568L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java
@@ -29,6 +29,7 @@
 @XStreamAlias("xml")
 public class WxPayRefundResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = -3392333879907788033L;
+
   /**
    * 微信订单号.
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java
@@ -21,6 +21,7 @@
 @XStreamAlias("xml")
 public class WxPaySandboxSignKeyResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = -5793375529340378941L;
+
   /**
    * <pre>
    * 沙箱密钥
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendMiniProgramRedpackResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendMiniProgramRedpackResult.java
@@ -19,6 +19,7 @@
 @XStreamAlias("xml")
 public class WxPaySendMiniProgramRedpackResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = 5847928569755121611L;
+
   /**
    * 商户订单号.
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java
@@ -22,6 +22,7 @@
 @XStreamAlias("xml")
 public class WxPaySendRedpackResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = -4837415036337132073L;
+
   private static final String PROCESSING = "PROCESSING";
 
   @XStreamAlias("mch_billno")
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java
@@ -22,6 +22,7 @@
 @XStreamAlias("xml")
 public class WxPayShorturlResult extends BaseWxPayResult implements Serializable {
   private static final long serialVersionUID = -2121902492357304418L;
+
   /**
    * <pre>
    * URL链接

Original file line number	Diff line number	Diff line change
`@@ -76,4 +76,8 @@ public void testGetCategory() {`
`76`	`76`	`@Test`
`77`	`77`	`public void testSend() {`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ @Test`
	`81`	`+ public void testSendOnce() {`
	`82`	`+ }`
`79`	`83`	`}`