diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java
index 16c74ec5..b3e84b5c 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java
@@ -45,7 +45,9 @@ import com.foxinmy.weixin4j.xml.XmlStream;
* @see
* 企业付款
+ * @deprecated 商户平台API迁移到子模块weixin4j-pay
*/
+@Deprecated
public class CashApi extends MchApi {
public CashApi(WeixinPayAccount weixinAccount) {
@@ -92,7 +94,7 @@ public class CashApi extends MchApi {
/**
* 批量发放红包 企业向微信用户个人发现金红包
*
- * @param redpacket
+ * @param redpackets
* 多个红包信息
* @return 发放结果
* @see #sendRedpacks(Redpacket...)
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CouponApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CouponApi.java
index 0aa07e6c..4129614d 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CouponApi.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CouponApi.java
@@ -21,7 +21,9 @@ import com.foxinmy.weixin4j.xml.XmlStream;
* @since JDK 1.6
* @see 代金券
+ * @deprecated 商户平台API迁移到子模块weixin4j-pay
*/
+@Deprecated
public class CouponApi extends MchApi {
public CouponApi(WeixinPayAccount weixinAccount) {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CustomsApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CustomsApi.java
index b273c0fb..7aed672d 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CustomsApi.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CustomsApi.java
@@ -22,7 +22,9 @@ import com.foxinmy.weixin4j.xml.XmlStream;
* @date 2016年3月67日
* @since JDK 1.6
* @see
+ * @deprecated 商户平台API迁移到子模块weixin4j-pay
*/
+@Deprecated
public class CustomsApi extends MchApi {
public CustomsApi(WeixinPayAccount weixinAccount) {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/MchApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/MchApi.java
index 8f89afe8..b0323a0e 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/MchApi.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/MchApi.java
@@ -27,7 +27,9 @@ import com.foxinmy.weixin4j.util.Weixin4jConfigUtil;
* @date 2016年3月26日
* @since JDK 1.6
* @see 商户支付平台
+ * @deprecated 商户平台API迁移到子模块weixin4j-pay
*/
+@Deprecated
public class MchApi extends BaseApi {
private final static ResourceBundle WEIXIN_BUNDLE;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java
index e852eff6..b7f6e8ca 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java
@@ -60,7 +60,9 @@ import com.foxinmy.weixin4j.xml.XmlStream;
* @author jinyu(foxinmy@gmail.com)
* @date 2014年10月28日
* @since JDK 1.6
+ * @deprecated 商户平台API迁移到子模块weixin4j-pay
*/
+@Deprecated
public class PayApi extends MchApi {
public PayApi(WeixinPayAccount weixinAccount) {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/WeixinPayAccount.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/WeixinPayAccount.java
index 46a713a4..f23fbcb2 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/WeixinPayAccount.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/WeixinPayAccount.java
@@ -12,7 +12,9 @@ import com.foxinmy.weixin4j.util.StringUtil;
* @date 2015年6月26日
* @since JDK 1.6
* @see
+ * @deprecated 支付相关的类现已迁移到weixin4j-pay子模块
*/
+@Deprecated
public class WeixinPayAccount extends WeixinAccount {
private static final long serialVersionUID = -2791256176906048632L;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/JsPayNotify.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/JsPayNotify.java
index 25f61cdd..2cd87d05 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/JsPayNotify.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/JsPayNotify.java
@@ -15,7 +15,9 @@ import com.alibaba.fastjson.annotation.JSONField;
* @date 2014年8月19日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class JsPayNotify extends PayBaseInfo {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayBaseInfo.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayBaseInfo.java
index 07f4796e..b45b330c 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayBaseInfo.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayBaseInfo.java
@@ -19,7 +19,9 @@ import com.foxinmy.weixin4j.type.SignType;
* @date 2014年11月5日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class PayBaseInfo implements Serializable {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayPackage.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayPackage.java
index 00746673..8140b6ba 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayPackage.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayPackage.java
@@ -18,7 +18,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @author jinyu(foxinmy@gmail.com)
* @date 2014年12月18日
* @since JDK 1.6
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class PayPackage extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayRequest.java
index c6e2d728..7568277b 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayRequest.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayRequest.java
@@ -10,6 +10,7 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.foxinmy.weixin4j.util.DateUtil;
import com.foxinmy.weixin4j.util.RandomUtil;
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class PayRequest extends PayBaseInfo {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java
index 77f021a0..b418a20e 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java
@@ -56,7 +56,9 @@ import com.foxinmy.weixin4j.util.Weixin4jConfigUtil;
* @date 2015年1月3日
* @since JDK 1.6
* @see 商户平台支付API
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class WeixinPayProxy {
/**
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponDetail.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponDetail.java
index 18173d6e..deed288b 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponDetail.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponDetail.java
@@ -22,7 +22,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @date 2015年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CouponDetail extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponResult.java
index 2c4b0ba2..b9317583 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponResult.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponResult.java
@@ -16,7 +16,9 @@ import com.foxinmy.weixin4j.payment.mch.MerchantResult;
* @date 2015年3月25日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CouponResult extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponStock.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponStock.java
index e4e6ecef..6fc55765 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponStock.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponStock.java
@@ -21,7 +21,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @date 2015年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CouponStock extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/OrderCouponInfo.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/OrderCouponInfo.java
index 85948d6d..6999e0ef 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/OrderCouponInfo.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/OrderCouponInfo.java
@@ -18,7 +18,9 @@ import com.foxinmy.weixin4j.type.mch.CouponType;
* @date 2015年3月24日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class OrderCouponInfo implements Serializable {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/RefundCouponInfo.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/RefundCouponInfo.java
index 4392345a..e660d6fa 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/RefundCouponInfo.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/RefundCouponInfo.java
@@ -17,7 +17,9 @@ import com.alibaba.fastjson.annotation.JSONField;
* @date 2015年3月24日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class RefundCouponInfo implements Serializable {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/APPPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/APPPayRequest.java
index e8ce7267..d9c8b981 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/APPPayRequest.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/APPPayRequest.java
@@ -21,7 +21,9 @@ import com.foxinmy.weixin4j.util.MapUtil;
* @see com.foxinmy.weixin4j.payment.PayRequest
* @see APP支付
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class APPPayRequest extends AbstractPayRequest {
public APPPayRequest(String prePayId, WeixinPayAccount payAccount) {
super(prePayId, payAccount);
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/AbstractPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/AbstractPayRequest.java
index 7e344dd8..c75d225d 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/AbstractPayRequest.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/AbstractPayRequest.java
@@ -4,6 +4,7 @@ import com.foxinmy.weixin4j.model.WeixinPayAccount;
import com.foxinmy.weixin4j.sign.WeixinPaymentSignature;
import com.foxinmy.weixin4j.sign.WeixinSignature;
+@Deprecated
public abstract class AbstractPayRequest implements MchPayRequest {
private final String prePayId;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPayment.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPayment.java
index 16eccfef..2ad2123c 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPayment.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPayment.java
@@ -17,7 +17,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @date 2015年4月1日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CorpPayment extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPaymentRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPaymentRecord.java
index 85e50da6..fd421cde 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPaymentRecord.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPaymentRecord.java
@@ -19,7 +19,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @date 2015年6月23日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CorpPaymentRecord extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPaymentResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPaymentResult.java
index f0656a4f..62011fd1 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPaymentResult.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPaymentResult.java
@@ -18,7 +18,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @date 2015年4月1日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CorpPaymentResult extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrder.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrder.java
index b76ad761..39f0ca03 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrder.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrder.java
@@ -15,7 +15,9 @@ import com.foxinmy.weixin4j.type.CustomsCity;
* @date 2016年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class CustomsOrder extends MerchantResult {
private static final long serialVersionUID = 799510373861612386L;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrderRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrderRecord.java
index 305e67ce..6c701831 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrderRecord.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrderRecord.java
@@ -15,7 +15,9 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult;
* @date 2016年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class CustomsOrderRecord extends MerchantResult {
private static final long serialVersionUID = -1675090110657154049L;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrderResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrderResult.java
index 43363715..f06d42a3 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrderResult.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CustomsOrderResult.java
@@ -16,7 +16,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @date 2016年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class CustomsOrderResult extends MerchantResult {
private static final long serialVersionUID = 799510373861612386L;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/JSAPIPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/JSAPIPayRequest.java
index 258167ce..f9656824 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/JSAPIPayRequest.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/JSAPIPayRequest.java
@@ -22,7 +22,9 @@ import com.foxinmy.weixin4j.type.TradeType;
* @see com.foxinmy.weixin4j.payment.PayRequest
* @see 网页端调起支付API
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class JSAPIPayRequest extends AbstractPayRequest {
public JSAPIPayRequest(String prePayId, WeixinPayAccount payAccount) {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MICROPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MICROPayRequest.java
index 72ad9661..96959272 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MICROPayRequest.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MICROPayRequest.java
@@ -18,7 +18,9 @@ import com.foxinmy.weixin4j.type.TradeType;
* @see com.foxinmy.weixin4j.payment.PayRequest
* @see 刷卡支付
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class MICROPayRequest extends Order implements MchPayRequest {
private static final long serialVersionUID = 6147576305404111278L;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java
index f454c14e..2de072ee 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java
@@ -20,7 +20,9 @@ import com.foxinmy.weixin4j.type.TradeType;
* @date 2014年10月21日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class MchPayPackage extends PayPackage {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java
index 1feda2b4..63bdcbee 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java
@@ -16,7 +16,9 @@ import com.foxinmy.weixin4j.type.TradeType;
* @see MICROPayRequest 刷卡支付
* @see APPPayRequest APP支付
* @see WAPPayRequest WAP支付
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public interface MchPayRequest {
/**
* 预支付交易ID
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantResult.java
index 6561dd2f..3b985779 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantResult.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantResult.java
@@ -17,7 +17,9 @@ import com.foxinmy.weixin4j.type.SignType;
* @date 2014年10月21日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class MerchantResult extends XmlResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantTradeResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantTradeResult.java
index c52274d3..ef18ae64 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantTradeResult.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantTradeResult.java
@@ -13,7 +13,9 @@ import com.foxinmy.weixin4j.type.CurrencyType;
* @date 2016年7月21日
* @since JDK 1.7
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class MerchantTradeResult extends MerchantResult {
private static final long serialVersionUID = 4205906286092873877L;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NATIVEPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NATIVEPayRequest.java
index 3eb7809c..0b156419 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NATIVEPayRequest.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NATIVEPayRequest.java
@@ -15,7 +15,9 @@ import com.foxinmy.weixin4j.type.TradeType;
* @see com.foxinmy.weixin4j.payment.PayRequest
* @see NATIVE扫码支付(模式二)
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class NATIVEPayRequest extends AbstractPayRequest {
private final String codeUrl;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayNotify.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayNotify.java
index 323e6f11..63e1dd0d 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayNotify.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayNotify.java
@@ -15,7 +15,9 @@ import com.alibaba.fastjson.annotation.JSONField;
* @date 2014年10月30日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class NativePayNotify extends OpenIdResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayResponse.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayResponse.java
index 0cd0267b..82591c51 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayResponse.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayResponse.java
@@ -19,7 +19,9 @@ import com.foxinmy.weixin4j.util.RandomUtil;
* @date 2014年10月28日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class NativePayResponse extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/OpenIdResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/OpenIdResult.java
index 2d494554..2a1ae821 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/OpenIdResult.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/OpenIdResult.java
@@ -15,7 +15,9 @@ import com.alibaba.fastjson.annotation.JSONField;
* @date 2015年7月23日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class OpenIdResult extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java
index f6662181..82c70c1c 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java
@@ -25,7 +25,9 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult;
* @date 2014年11月2日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Order extends MerchantTradeResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/PrePay.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/PrePay.java
index 7c7306c1..d0c44637 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/PrePay.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/PrePay.java
@@ -16,7 +16,9 @@ import com.foxinmy.weixin4j.type.TradeType;
* @date 2014年10月21日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class PrePay extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java
index 0000003f..06ce10dd 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java
@@ -20,7 +20,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* href="https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_1">普通红包
* @see 裂变红包
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Redpacket extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java
index 760d57fe..6082e0e7 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java
@@ -25,7 +25,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @date 2015年6月4日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class RedpacketRecord extends XmlResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRisk.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRisk.java
index 809d4738..c2cda3a6 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRisk.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRisk.java
@@ -17,7 +17,9 @@ import com.foxinmy.weixin4j.util.MapUtil;
* @date 2017年1月4日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class RedpacketRisk {
private Map risk;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketSendResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketSendResult.java
index bc64471a..1dd05939 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketSendResult.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketSendResult.java
@@ -18,7 +18,9 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @date 2015年4月1日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class RedpacketSendResult extends MerchantResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java
index 2ac72095..aaec86a4 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java
@@ -24,7 +24,9 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult;
* @author jinyu(foxinmy@gmail.com)
* @date 2016年7月21日
* @since JDK 1.6
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class RefundDetail implements Serializable {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundRecord.java
index 945b4e64..3ed978f0 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundRecord.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundRecord.java
@@ -17,7 +17,9 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult;
* @author jinyu(foxinmy@gmail.com)
* @date 2014年11月1日
* @since JDK 1.6
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class RefundRecord extends MerchantTradeResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundResult.java
index 2b46cafa..9768a341 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundResult.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundResult.java
@@ -19,7 +19,9 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult;
* @date 2014年11月6日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class RefundResult extends MerchantTradeResult {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SceneInfoApp.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SceneInfoApp.java
index 62912079..29a7992a 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SceneInfoApp.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SceneInfoApp.java
@@ -4,6 +4,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class SceneInfoApp {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SceneInfoStore.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SceneInfoStore.java
index 23674a6b..a4bd7698 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SceneInfoStore.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SceneInfoStore.java
@@ -7,6 +7,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import com.alibaba.fastjson.annotation.JSONField;
+@Deprecated
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class SceneInfoStore {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SettlementRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SettlementRecord.java
index ffb2d678..46811a65 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SettlementRecord.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/SettlementRecord.java
@@ -17,6 +17,7 @@ import com.foxinmy.weixin4j.util.DateUtil;
* @since JDK 1.6
* @see
*/
+@Deprecated
public class SettlementRecord extends MerchantResult {
private static final long serialVersionUID = 7952659545609519979L;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/WAPPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/WAPPayRequest.java
index 17ce2bad..2895d30e 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/WAPPayRequest.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/WAPPayRequest.java
@@ -16,6 +16,7 @@ import com.foxinmy.weixin4j.type.TradeType;
* @see WAP支付
*/
+@Deprecated
public class WAPPayRequest extends AbstractPayRequest {
/**
* 微信支付URL
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/AbstractWeixinSignature.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/AbstractWeixinSignature.java
index 946066cc..de91afe1 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/AbstractWeixinSignature.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/AbstractWeixinSignature.java
@@ -10,7 +10,9 @@ import com.foxinmy.weixin4j.util.MapUtil;
* @date 2016年3月26日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public abstract class AbstractWeixinSignature implements WeixinSignature {
/**
* 是否编码
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/WeixinPaymentSignature.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/WeixinPaymentSignature.java
index 9d32ef29..1905ad58 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/WeixinPaymentSignature.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/WeixinPaymentSignature.java
@@ -12,7 +12,9 @@ import com.foxinmy.weixin4j.util.DigestUtil;
* @since JDK 1.6
* @see 支付签名说明
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class WeixinPaymentSignature extends AbstractWeixinSignature {
/**
* 支付密钥
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/WeixinSignature.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/WeixinSignature.java
index 2b7574da..da133527 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/WeixinSignature.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/sign/WeixinSignature.java
@@ -10,7 +10,9 @@ import com.foxinmy.weixin4j.type.SignType;
* @date 2016年3月26日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public interface WeixinSignature {
/**
* 是否编码
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BankType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BankType.java
index f0db2a69..70cd9f72 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BankType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BankType.java
@@ -9,7 +9,9 @@ package com.foxinmy.weixin4j.type;
* @date 2015年8月19日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum BankType {
/**
* 工商银行（借记卡）
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CredentialType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CredentialType.java
index 4340c827..1d46317d 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CredentialType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CredentialType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2016年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CredentialType {
IDCARD("身份证");
CredentialType(String name) {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CurrencyType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CurrencyType.java
index 26baf846..a846033b 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CurrencyType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CurrencyType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2014年11月2日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CurrencyType {
CNY("人民币"), HKD("港元"), TWD("台币"), EUR("欧元"), USD("美元"), GBP("英镑"), JPY("日元"), CAD(
"加拿大元"), AUD("澳大利亚元"), NZD("新西兰元"), KRW("韩元"), THB("泰铢");
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CustomsCity.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CustomsCity.java
index 874446d4..9ed49d60 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CustomsCity.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CustomsCity.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2016年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CustomsCity {
NO("无需上报海关"), GUANGZHOU("广州"), HANGZHOU("杭州"), NINGBO("宁波"), ZHENGZHOU_BS(
"郑州（保税物流中心）"), CHONGQING("重庆"), XIAN("西安"), SHANGHAI("上海"), ZHENGZHOU_ZH(
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CustomsSatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CustomsSatus.java
index 50437bda..a807c23d 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CustomsSatus.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CustomsSatus.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2016年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CustomsSatus {
UNDECLARED("未申报"), SUBMITTED("申报已提交"), PROCESSING("申报中"), SUCCESS("申报成功"), FAIL(
"申报失败"), EXCEPT("海关接口异常");
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdQuery.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdQuery.java
index 4757dce7..e1470413 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdQuery.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdQuery.java
@@ -10,7 +10,9 @@ import java.io.Serializable;
* @date 2014年11月1日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public class IdQuery implements Serializable {
private static final long serialVersionUID = -5273675987521807370L;
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdType.java
index 70c1f105..3a475d57 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2014年11月1日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum IdType {
/**
* 微信退款单号
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/SignType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/SignType.java
index 60cb1526..fff58546 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/SignType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/SignType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2014年11月5日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum SignType {
SHA1, MD5, HMAC$SHA256
}
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TarType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TarType.java
index 1e48af17..efffde26 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TarType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TarType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2016年12月21日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum TarType {
GZIP
}
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeState.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeState.java
index 2d974e0f..2ec5b42c 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeState.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeState.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2014年11月2日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum TradeState {
/**
* 支付成功
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java
index c660a2ec..b77fa3fb 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type;
* @date 2014年10月21日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到weixin4j-pay子模块
*/
+@Deprecated
public enum TradeType {
/**
* JS支付
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/BillType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/BillType.java
index d0951468..baace932 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/BillType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/BillType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2014年10月31日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum BillType {
/**
* 全部
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java
index 593e5872..40631c48 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2015年4月1日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CorpPaymentCheckNameType {
/**
* 不校验真实姓名
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStatus.java
index 18060971..38956878 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStatus.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStatus.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2015年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CouponStatus {
/**
* 已激活
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStockStatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStockStatus.java
index 946966d8..765502c4 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStockStatus.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStockStatus.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2015年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CouponStockStatus {
/**
* 未激活
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStockType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStockType.java
index 94d088b3..adf7be50 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStockType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponStockType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2015年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CouponStockType {
/**
* 批量型
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponType.java
index 76d979f6..116c980c 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CouponType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2015年3月27日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum CouponType {
/**
* 使用无门槛
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketSceneType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketSceneType.java
index 0da68f68..a477bd7e 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketSceneType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketSceneType.java
@@ -7,7 +7,9 @@ package com.foxinmy.weixin4j.type.mch;
* @author jinyu(foxinmy@gmail.com)
* @date 2017年1月4日
* @since JDK 1.6
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum RedpacketSceneType {
/**
* 商品促销
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketSendType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketSendType.java
index b446458d..265b15ca 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketSendType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketSendType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2015年6月4日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum RedpacketSendType {
/**
* 通过API接口发放
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketStatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketStatus.java
index afa49e52..4fc6d723 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketStatus.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketStatus.java
@@ -7,7 +7,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2015年6月4日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum RedpacketStatus {
/**
* 发放中
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketType.java
index 70056054..be34cc78 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RedpacketType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2015年6月4日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum RedpacketType {
/**
* 裂变红包
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundAccountType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundAccountType.java
index af10c2e1..d4088929 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundAccountType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundAccountType.java
@@ -5,7 +5,9 @@ package com.foxinmy.weixin4j.type.mch;
* @className RefundAccountType
* @author jinyu(foxinmy@gmail.com)
* @date 2016年12月12日
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum RefundAccountType {
/**
* ---未结算资金退款（默认使用未结算资金退款）
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundChannel.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundChannel.java
index 144e49ab..ae729875 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundChannel.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundChannel.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2014年11月6日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum RefundChannel {
/**
* 原路退款
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundStatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundStatus.java
index dc294571..7c645ed3 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundStatus.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundStatus.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2014年11月2日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum RefundStatus {
/**
* 退款成功
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundType.java
index 1724db2c..1e62943d 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundType.java
@@ -8,7 +8,9 @@ package com.foxinmy.weixin4j.type.mch;
* @date 2014年12月31日
* @since JDK 1.6
* @see
+ * @deprecated 迁移到子模块weixin4j-pay
*/
+@Deprecated
public enum RefundType {
/**
* 1:商户号余额退款;