Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/github/microservice/types/payment/PaymentType.java

src/main/java/com/github/microservice/types/OrderState.java

@@ -43,6 +43,8 @@ public enum OrderState {
 
     CLOSED("已关闭"),
 
+    Expired("已过期"),
+
     CANCEL("已取消"),
 
     SUCCESS("支付成功"),

src/main/java/com/github/microservice/types/payment/PaymentChannelType.java

@@ -8,6 +8,7 @@ import lombok.Getter;
 public enum PaymentChannelType {
     SecretFreePayment("免密支付"),
     BalancePayment("余额支付"),
+    WxPayment("微信支付"),
     DirectPayment("直营支付"),
     WeChatMiniPay("微信支付"),
 

src/main/java/com/github/microservice/types/payment/PaymentType.java

@@ -6,8 +6,8 @@ import lombok.Getter;
  * 支付方式
  */
 public enum PaymentType {
-    WeChat("微信充值支付", false, PaymentChannelType.BalancePayment),
-    WeChatPay("微信直接支付", false, PaymentChannelType.WeChatMiniPay),
+    WeChatPay("微信支付", false, PaymentChannelType.WxPayment),
+    WeChat("微信充值", false, PaymentChannelType.BalancePayment),
     UserWallet("个人钱包", false, PaymentChannelType.BalancePayment),
     UnionFrictionlessPay("银联无感支付", true, PaymentChannelType.SecretFreePayment),
     Alipay("支付宝", false, PaymentChannelType.BalancePayment),