Skip to content

caosy / fun-common

Go to a project
Commit e56f5408 by Huang Linyu
Options

add comment for all order States

parent d952f604
Inline Side-by-side
Showing with 77 additions and 51 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OrderStatusBitEnum.java
...@@ -39,123 +39,123 @@ public enum OrderStatusBitEnum { ...@@ -39,123 +39,123 @@ public enum OrderStatusBitEnum {
// 2^26=268435456 --成交 // 2^26=268435456 --成交
/** /**
* 未操作 * 未操作0
*/ */
UNOPERATION(0, "UNOPERATION", "未操作"), UNOPERATION(0, "UNOPERATION", "未操作"),
/** /**
* 确认产品 * 确认产品1
*/ */
CONFIRM_PRODUCT(1, "CONFIRM_PRODUCT", "确认产品"), CONFIRM_PRODUCT(1, "CONFIRM_PRODUCT", "确认产品"),
/** /**
* 确认客户 * 确认客户2
*/ */
CONFIRM_CUSTOMER(2, "CONFIRM_CUSTOMER", "确认客户"), CONFIRM_CUSTOMER(2, "CONFIRM_CUSTOMER", "确认客户"),
/** /**
* 扣款中 * 扣款中4
*/ */
DEDUCTING(4, "DEDUCTING", "扣款中"), DEDUCTING(4, "DEDUCTING", "扣款中"),
/** /**
* 扣款失败 * 扣款失败8
*/ */
DEDUCT_FAILED(8, "DEDUCT_FAILED", "扣款失败"), DEDUCT_FAILED(8, "DEDUCT_FAILED", "扣款失败"),
/** /**
* 已扣款 * 已扣款16
*/ */
DEDUCTED(16, "DEDUCTED", "已扣款"), DEDUCTED(16, "DEDUCTED", "已扣款"),
/** /**
* 取消中 * 取消中32
*/ */
CANCELING(32, "CANCELING", "取消中"), CANCELING(32, "CANCELING", "取消中"),
/** /**
* 已取消 * 已取消64
*/ */
CANCELED(64, "CANCELED", "已取消"), CANCELED(64, "CANCELED", "已取消"),
/** /**
* 退订中 * 退订中128
*/ */
UNSUBSCRIBING(128, "UNSUBSCRIBING", "退订中"), UNSUBSCRIBING(128, "UNSUBSCRIBING", "退订中"),
/** /**
* 退款中 * 退款中256
*/ */
REFUNDING(256, "REFUNDING", "退款中"), REFUNDING(256, "REFUNDING", "退款中"),
/** /**
* 退款失败 * 退款失败512
*/ */
REFUND_FAILED(512, "REFUND_FAILED", "退款失败"), REFUND_FAILED(512, "REFUND_FAILED", "退款失败"),
/** /**
* 已退款 * 已退款1024
*/ */
REFUNDED(1024, "REFUNDED", "已退款"), REFUNDED(1024, "REFUNDED", "已退款"),
/** /**
* 已退订 * 已退订2048
*/ */
UNSUBSCRIBED(2048, "UNSUBSCRIBED", "已退订"), UNSUBSCRIBED(2048, "UNSUBSCRIBED", "已退订"),
/** /**
* 成交部分退订 * 成交部分退订4096
*/ */
PART_UNSUBSCRIBED(4096, "PART_UNSUBSCRIBED", "成交部分退订"), PART_UNSUBSCRIBED(4096, "PART_UNSUBSCRIBED", "成交部分退订"),
/** /**
* 成交全部退订 * 成交全部退订8192
*/ */
ALL_UNSUBSCRIBED(8192, "ALL_UNSUBSCRIBED", "成交全部退订"), ALL_UNSUBSCRIBED(8192, "ALL_UNSUBSCRIBED", "成交全部退订"),
/** /**
* 担保转扣款中 * 担保转扣款中16384
*/ */
GUARANTEE_TO_DEDUCTING(16384, "GUARANTEE_TO_DEDUCTING", "担保转扣款中"), GUARANTEE_TO_DEDUCTING(16384, "GUARANTEE_TO_DEDUCTING", "担保转扣款中"),
/** /**
* 担保转扣款失败 * 担保转扣款失败 32768
*/ */
GUARANTEE_TO_DEDUCTION_FAILED(32768, "GUARANTEE_TO_DEDUCTION_FAILED", "担保转扣款失败"), GUARANTEE_TO_DEDUCTION_FAILED(32768, "GUARANTEE_TO_DEDUCTION_FAILED", "担保转扣款失败"),
/** /**
* 已担保转扣款 * 已担保转扣款 65536
*/ */
GUARANTEE_TO_DEDUCTED(65536, "GUARANTEE_TO_DEDUCTED", "已担保转扣款"), GUARANTEE_TO_DEDUCTED(65536, "GUARANTEE_TO_DEDUCTED", "已担保转扣款"),
/** /**
* 预授权转扣款中 * 预授权转扣款中131072
*/ */
PRE_AUTHORIZATION_DEDUCTING(131072, "PRE_AUTHORIZATION_DEDUCTING", "预授权转扣款中"), PRE_AUTHORIZATION_DEDUCTING(131072, "PRE_AUTHORIZATION_DEDUCTING", "预授权转扣款中"),
/** /**
* 预授权转扣款失败 * 预授权转扣款失败262144
*/ */
PRE_AUTHORIZATION_DEDUCTION_FAILED(262144, "PRE_AUTHORIZATION_DEDUCTION_FAILED", "预授权转扣款失败"), PRE_AUTHORIZATION_DEDUCTION_FAILED(262144, "PRE_AUTHORIZATION_DEDUCTION_FAILED", "预授权转扣款失败"),
/** /**
* 已预授权转扣款 * 已预授权转扣款524288
*/ */
PRE_AUTHORIZATION_DEDUCTED(524288, "PRE_AUTHORIZATION_DEDUCTED", "已预授权转扣款"), PRE_AUTHORIZATION_DEDUCTED(524288, "PRE_AUTHORIZATION_DEDUCTED", "已预授权转扣款"),
/** /**
* 解除预授权中 * 解除预授权中1048576
*/ */
UNFREEZE_PRE_AUTHORIZATING(1048576, "UNFREEZE_PRE_AUTHORIZATION", "解除预授权中"), UNFREEZE_PRE_AUTHORIZATING(1048576, "UNFREEZE_PRE_AUTHORIZATION", "解除预授权中"),
/** /**
* 解除预授权失败 * 解除预授权失败2097152
*/ */
UNFREEZE_PRE_AUTHORIZATE_FAILED(2097152, "UNFREEZE_PRE_AUTHORIZATE_FAILED", "解除预授权失败"), UNFREEZE_PRE_AUTHORIZATE_FAILED(2097152, "UNFREEZE_PRE_AUTHORIZATE_FAILED", "解除预授权失败"),
/** /**
* 已解除预授权 * 已解除预授权4194304
*/ */
UNFREEZE_PRE_AUTHORIZATED(4194304, "UNFREEZE_PRE_AUTHORIZATE_FAILED", "已解除预授权"), UNFREEZE_PRE_AUTHORIZATED(4194304, "UNFREEZE_PRE_AUTHORIZATE_FAILED", "已解除预授权"),
/** /**
* 确认打款 * 确认打款8388608
*/ */
CONFIRM_PAIED(8388608, "CONFIRM_PAIED", "确认打款"), CONFIRM_PAIED(8388608, "CONFIRM_PAIED", "确认打款"),
/** /**
* 确认发票 * 确认发票16777216
*/ */
CONFIRM_INVOICE(16777216, "CONFIRM_INVOICE", "确认发票"), CONFIRM_INVOICE(16777216, "CONFIRM_INVOICE", "确认发票"),
/** /**
* 待预授权处理 * 待预授权处理33554432
*/ */
WAIT_PREAUTH_HANDING(33554432, "WAIT_PREAUTH_HANDING", "待预授权处理"), WAIT_PREAUTH_HANDING(33554432, "WAIT_PREAUTH_HANDING", "待预授权处理"),
/** /**
* 成交 * 成交268435456
*/ */
BARGAINED(268435456, "BARGAINED", "成交"); BARGAINED(268435456, "BARGAINED", "成交");
......
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OrderStatusEnum.java
...@@ -20,16 +20,20 @@ public enum OrderStatusEnum { ...@@ -20,16 +20,20 @@ public enum OrderStatusEnum {
/** /**
* 未支付 * 未支付
* 成交268435456 已取消64
*/ */
NOT_PAY("NOT_PAY", 0, null, null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { 0 }, "未支付"), NOT_PAY("NOT_PAY", 0, null, null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { 0 }, "未支付"),
/** /**
* 已取消的订单状态 * 已取消的订单状态
* 成交268435456 已取消64
*/ */
CANCEL("CANCEL", null, null, null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.CANCELED.getValue() }, CANCEL("CANCEL", null, null, null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.CANCELED.getValue() },
"已取消"), "已取消"),
/** /**
* 待扣款的订单状态 * 待扣款的订单状态
* 成交268435456 待预授权处理33554432 已退订2048 已退款1024 退订中128 已取消64 取消中32 已付款16 确认客户2 确认产品 1
*
*/ */
WAITING_CHARGED("WAITING_CHARGED", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" WAITING_CHARGED("WAITING_CHARGED", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','"
+ ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue()
...@@ -38,6 +42,7 @@ public enum OrderStatusEnum { ...@@ -38,6 +42,7 @@ public enum OrderStatusEnum {
+ OrderStatusBitEnum.WAIT_PREAUTH_HANDING.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { 0 }, "待扣款"), + OrderStatusBitEnum.WAIT_PREAUTH_HANDING.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { 0 }, "待扣款"),
/** /**
* 扣款中的订单状态 * 扣款中的订单状态
* 成交268435456 待预授权处理33554432 确认打款8388608 已退订2048 已退款1024 退订中128 已取消64 取消中32 已付款16 付款失败8 扣款中4
*/ */
CHARGING("CHARGING", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" + ProductPaymentTypeEnum.CREDIT.getName() + "'", CHARGING("CHARGING", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" + ProductPaymentTypeEnum.CREDIT.getName() + "'",
null, OrderStatusBitEnum.DEDUCTING.getValue() + OrderStatusBitEnum.DEDUCT_FAILED.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() + OrderStatusBitEnum.CANCELING.getValue() null, OrderStatusBitEnum.DEDUCTING.getValue() + OrderStatusBitEnum.DEDUCT_FAILED.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() + OrderStatusBitEnum.CANCELING.getValue()
...@@ -46,13 +51,16 @@ public enum OrderStatusEnum { ...@@ -46,13 +51,16 @@ public enum OrderStatusEnum {
+ OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.DEDUCTING.getValue() }, "扣款中"), + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.DEDUCTING.getValue() }, "扣款中"),
/** /**
* 扣款失败的订单状态 * 扣款失败的订单状态
* 成交268435456 待预授权处理33554432 已取消64 已付款16 付款失败8
*/ */
CHARGE_FAILED("CHARGE_FAILED", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" CHARGE_FAILED("CHARGE_FAILED", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','"
+ ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.DEDUCT_FAILED.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.DEDUCT_FAILED.getValue() + OrderStatusBitEnum.DEDUCTED.getValue()
+ OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.WAIT_PREAUTH_HANDING.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", + OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.WAIT_PREAUTH_HANDING.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=",
new Integer[] { OrderStatusBitEnum.DEDUCT_FAILED.getValue() }, "扣款失败"), new Integer[] { OrderStatusBitEnum.DEDUCT_FAILED.getValue() }, "扣款失败"),
/** /**
* 待处理(已扣款成功的订单状态) * 待处理(已扣款成功的订单状态) 303198715
* 成交268435456 待预授权处理33554432 解除预授权中1048576 预授权转扣款中131072 担保转扣款中16384 成交全部退订8192 成交部分退订4096 退款中256 退订中128 已取消64 取消中32 已付款16 付款失败8 确认客户2 确认产品 1
*
*/ */
WAITING_DEAL("WAITING_DEAL", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" WAITING_DEAL("WAITING_DEAL", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','"
+ ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue()
...@@ -67,7 +75,8 @@ public enum OrderStatusEnum { ...@@ -67,7 +75,8 @@ public enum OrderStatusEnum {
OrderStatusBitEnum.DEDUCTED.getValue() + OrderStatusBitEnum.REFUNDING.getValue() + OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue() }, "待处理(已扣款)"), OrderStatusBitEnum.DEDUCTED.getValue() + OrderStatusBitEnum.REFUNDING.getValue() + OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue() }, "待处理(已扣款)"),
/** /**
* 待处理(现付) * 待处理(现付) 302018939
* 成交268435456 待预授权处理33554432 担保转扣款中16384 成交全部退订8192 成交部分退订4096 退款中256 已取消64 取消中32 已付款16 付款失败8 确认客户2 确认产品 1
*/ */
WAITING_DEAL_CASH("WAITING_DEAL_CASH", 1, "'" + ProductPaymentTypeEnum.DESK.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() WAITING_DEAL_CASH("WAITING_DEAL_CASH", 1, "'" + ProductPaymentTypeEnum.DESK.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue()
+ OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCT_FAILED.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() + OrderStatusBitEnum.CANCELING.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCT_FAILED.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() + OrderStatusBitEnum.CANCELING.getValue()
...@@ -75,7 +84,8 @@ public enum OrderStatusEnum { ...@@ -75,7 +84,8 @@ public enum OrderStatusEnum {
+ OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.GUARANTEE_TO_DEDUCTING.getValue() + OrderStatusBitEnum.WAIT_PREAUTH_HANDING.getValue() + OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.GUARANTEE_TO_DEDUCTING.getValue() + OrderStatusBitEnum.WAIT_PREAUTH_HANDING.getValue()
+ OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { 0 }, "待处理(现付)"), + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { 0 }, "待处理(现付)"),
/** /**
* 等待打款 * 等待打款 (正常成功) 310394835
* 成交268435456 待预授权处理33554432 确认打款8388608 成交全部退订8192 成交部分退订4096 已退订2048 已退款1024 退款失败512 退款中256 退订中128 已取消64 已付款16 确认客户2 确认产品 1
*/ */
WAITING_PAY("WAITING_PAY", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" + ProductPaymentTypeEnum.CREDIT.getName() WAITING_PAY("WAITING_PAY", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" + ProductPaymentTypeEnum.CREDIT.getName()
+ "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCTED.getValue()
...@@ -89,7 +99,8 @@ public enum OrderStatusEnum { ...@@ -89,7 +99,8 @@ public enum OrderStatusEnum {
}, "等待打款(正常成功)"), }, "等待打款(正常成功)"),
/** /**
* 等待打款(部分退款) * 等待打款(部分退款) 310383955
* 成交268435456 待预授权处理33554432 确认打款8388608 成交部分退订4096 已退款1024 退款中256 已取消64 已付款16 确认客户2 确认产品 1
*/ */
WAITING_PAY_PARTY("WAITING_PAY_PARTY", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" WAITING_PAY_PARTY("WAITING_PAY_PARTY", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','"
+ ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue()
...@@ -103,7 +114,9 @@ public enum OrderStatusEnum { ...@@ -103,7 +114,9 @@ public enum OrderStatusEnum {
}, "等待打款(部分退款)"), }, "等待打款(部分退款)"),
/** /**
* 等待打款(现付) * 等待打款(现付)310394835
* 成交268435456 待预授权处理33554432 确认打款8388608 成交全部退订8192 成交部分退订4096 已退订2048 已退款1024 退款失败512 退款中256 退订中128 已取消64 已付款16 确认客户2 确认产品 1
*
*/ */
WAITING_PAY_CASH("WAITING_PAY_CASH", 1, "'" + ProductPaymentTypeEnum.DESK.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() WAITING_PAY_CASH("WAITING_PAY_CASH", 1, "'" + ProductPaymentTypeEnum.DESK.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue()
+ OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() + OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.UNSUBSCRIBING.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() + OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.UNSUBSCRIBING.getValue()
...@@ -116,7 +129,8 @@ public enum OrderStatusEnum { ...@@ -116,7 +129,8 @@ public enum OrderStatusEnum {
}, "等待打款(现付)"), }, "等待打款(现付)"),
/** /**
* 已确认 * 已确认310510059
* 成交268435456 待预授权处理33554432 确认打款8388608 预授权转扣款中131072 退款中256 退订中128 已取消64 取消中32 已付款16 付款失败8 确认客户2 确认产品 1
*/ */
CONFIRMED("CONFIRMED", 1, null, null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCT_FAILED.getValue() CONFIRMED("CONFIRMED", 1, null, null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCT_FAILED.getValue()
+ OrderStatusBitEnum.CANCELING.getValue() + OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.UNSUBSCRIBING.getValue() + OrderStatusBitEnum.REFUNDING.getValue() + OrderStatusBitEnum.CANCELING.getValue() + OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.UNSUBSCRIBING.getValue() + OrderStatusBitEnum.REFUNDING.getValue()
...@@ -125,7 +139,8 @@ public enum OrderStatusEnum { ...@@ -125,7 +139,8 @@ public enum OrderStatusEnum {
+ OrderStatusBitEnum.CONFIRM_PAIED.getValue() }, "已确认"), + OrderStatusBitEnum.CONFIRM_PAIED.getValue() }, "已确认"),
/** /**
* 部分退款成功（已打款） * 部分退款成功（已打款） 310383955
* 成交268435456 待预授权处理33554432 确认打款8388608 成交部分退订4096 已退款1024 退款中256 已取消64 已付款16 确认客户2 确认产品 1
*/ */
PARTIAL_REFUND("PARTIAL_REFUND", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" PARTIAL_REFUND("PARTIAL_REFUND", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','"
+ ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue()
...@@ -137,7 +152,8 @@ public enum OrderStatusEnum { ...@@ -137,7 +152,8 @@ public enum OrderStatusEnum {
+ OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.CONFIRM_PAIED.getValue() }, "部分退款成功（已打款）"), + OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.CONFIRM_PAIED.getValue() }, "部分退款成功（已打款）"),
/** /**
* 待退款 * 待退款16320
* 成交全部退订8192 成交部分退订4096 已退订2048 已退款1024 退款失败512 退款中256 退订中128 已取消64
*/ */
WAITING_REFUND("WAITING_REFUND", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" WAITING_REFUND("WAITING_REFUND", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','"
+ ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.UNSUBSCRIBING.getValue() + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.UNSUBSCRIBING.getValue()
...@@ -145,14 +161,16 @@ public enum OrderStatusEnum { ...@@ -145,14 +161,16 @@ public enum OrderStatusEnum {
+ OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.UNSUBSCRIBING.getValue() }, + OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.UNSUBSCRIBING.getValue() },
"待退款"), "待退款"),
/** /**
* 退款中 * 退款中268449600
* 成交268435456 成交全部退订8192 成交部分退订4096 已退款1024 退款失败512 退款中256 已取消64
*/ */
REFUNDING("REFUNDING", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" + ProductPaymentTypeEnum.CREDIT.getName() REFUNDING("REFUNDING", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" + ProductPaymentTypeEnum.CREDIT.getName()
+ "'", null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.REFUNDING.getValue() + OrderStatusBitEnum.REFUND_FAILED.getValue() + "'", null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.REFUNDING.getValue() + OrderStatusBitEnum.REFUND_FAILED.getValue()
+ OrderStatusBitEnum.REFUNDED.getValue() + OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.REFUNDED.getValue() + OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue()
+ OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.REFUNDING.getValue() }, "退款中"), + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.REFUNDING.getValue() }, "退款中"),
/** /**
* 退款失败 * 退款失败268451392
* 成交268435456 成交全部退订8192 成交部分退订4096 已退订2048 已退款1024 退款失败512 已取消64
*/ */
REFUND_FAILED("REFUND_FAILED", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" REFUND_FAILED("REFUND_FAILED", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','"
+ ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.REFUND_FAILED.getValue() + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.REFUND_FAILED.getValue()
...@@ -165,7 +183,8 @@ public enum OrderStatusEnum { ...@@ -165,7 +183,8 @@ public enum OrderStatusEnum {
// WAITING_PREAUTH("WAITING_PREAUTH", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PAIED.getValue() // WAITING_PREAUTH("WAITING_PREAUTH", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CONFIRM_PAIED.getValue()
// + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.CONFIRM_PAIED.getValue() }, "待预授权处理"), // + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.CONFIRM_PAIED.getValue() }, "待预授权处理"),
/** /**
* 等待预授权处理 * 等待预授权处理318636096
* 成交268435456 待预授权处理33554432 确认打款8388608 已解除预授权4194304 解除预授权失败2097152 解除预授权中1048576 已预授权转扣款524288 预授权转扣款失败262144 预授权转扣款中131072 已取消64
*/ */
WAITING_PREAUTH("WAITING_PREAUTH", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() WAITING_PREAUTH("WAITING_PREAUTH", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue()
+ OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTED.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTING.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTED.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTING.getValue()
...@@ -176,33 +195,38 @@ public enum OrderStatusEnum { ...@@ -176,33 +195,38 @@ public enum OrderStatusEnum {
+ OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.CONFIRM_PAIED.getValue() + OrderStatusBitEnum.WAIT_PREAUTH_HANDING.getValue() }, + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.CONFIRM_PAIED.getValue() + OrderStatusBitEnum.WAIT_PREAUTH_HANDING.getValue() },
"等待预授权处理"), "等待预授权处理"),
/** /**
* 预授权扣款中 * 预授权扣款中269353024
* 成交268435456 已预授权转扣款524288 预授权转扣款失败262144 预授权转扣款中131072 已取消64
*/ */
PREAUTH_DEDUCTING("PREAUTH_DEDUCTING", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() PREAUTH_DEDUCTING("PREAUTH_DEDUCTING", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue()
+ OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTING.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTION_FAILED.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTING.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTION_FAILED.getValue()
+ OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTING + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTING
.getValue() }, "预授权扣款中"), .getValue() }, "预授权扣款中"),
/** /**
* 预授权扣款失败 * 预授权扣款失败269221952
* 成交268435456 已预授权转扣款524288 预授权转扣款失败262144 已取消64
*/ */
PREAUTH_DEDUCT_FAILED("PREAUTH_DEDUCT_FAILED", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() PREAUTH_DEDUCT_FAILED("PREAUTH_DEDUCT_FAILED", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue()
+ OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTION_FAILED.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTION_FAILED.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&",
"=", new Integer[] { OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTION_FAILED.getValue() }, "预授权扣款失败"), "=", new Integer[] { OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTION_FAILED.getValue() }, "预授权扣款失败"),
/** /**
* 预授权解冻中 * 预授权解冻中 7340096
* 已解除预授权4194304 解除预授权失败2097152 解除预授权中1048576 已取消64
*/ */
PREAUTH_UNFREEZING("PREAUTH_UNFREEZING", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() PREAUTH_UNFREEZING("PREAUTH_UNFREEZING", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue()
+ OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATING.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATE_FAILED.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATING.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATE_FAILED.getValue()
+ OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATING.getValue() }, "预授权解冻中"), + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATED.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATING.getValue() }, "预授权解冻中"),
/** /**
* 预授权解冻失败 * 预授权解冻失败 6291520
* 已解除预授权4194304 解除预授权失败2097152 已取消64
*/ */
PREAUTH_UNFREEZE_FAILED("PREAUTH_UNFREEZE_FAILED", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() PREAUTH_UNFREEZE_FAILED("PREAUTH_UNFREEZE_FAILED", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue()
+ OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATE_FAILED.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATED.getValue(), "&", "=", + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATE_FAILED.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATED.getValue(), "&", "=",
new Integer[] { OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATE_FAILED.getValue() }, "预授权解冻失败"), new Integer[] { OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATE_FAILED.getValue() }, "预授权解冻失败"),
/** /**
* 全部退款成功 * 全部退款成功 268448832
* 成交268435456 成交部分退订4096 已退款1024 已取消64
*/ */
TOTAL_REFUND("TOTAL_REFUND", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "'", null, OrderStatusBitEnum.CANCELED TOTAL_REFUND("TOTAL_REFUND", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "'", null, OrderStatusBitEnum.CANCELED
.getValue() .getValue()
...@@ -213,7 +237,8 @@ public enum OrderStatusEnum { ...@@ -213,7 +237,8 @@ public enum OrderStatusEnum {
+ OrderStatusBitEnum.BARGAINED.getValue() }, "全部退款成功"), + OrderStatusBitEnum.BARGAINED.getValue() }, "全部退款成功"),
/** /**
* 预授权扣款成功 * 预授权扣款成功 269353024
* 成交268435456 已预授权转扣款524288 预授权转扣款失败262144 预授权转扣款中131072 已取消64
*/ */
PREAUTH_DEDUCT_SUCCESS("PREAUTH_DEDUCT_SUCCESS", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() PREAUTH_DEDUCT_SUCCESS("PREAUTH_DEDUCT_SUCCESS", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue()
+ OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTING.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTION_FAILED.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTING.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTION_FAILED.getValue()
...@@ -221,7 +246,8 @@ public enum OrderStatusEnum { ...@@ -221,7 +246,8 @@ public enum OrderStatusEnum {
.getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTED.getValue() + OrderStatusBitEnum.BARGAINED.getValue() }, "预授权扣款成功"), .getValue() + OrderStatusBitEnum.PRE_AUTHORIZATION_DEDUCTED.getValue() + OrderStatusBitEnum.BARGAINED.getValue() }, "预授权扣款成功"),
/** /**
* 预授权解冻成功 * 预授权解冻成功 275775552
* 成交268435456 已解除预授权4194304 解除预授权失败2097152 解除预授权中1048576 已取消64
*/ */
PREAUTH_UNFREEZE_SUCCESS("PREAUTH_UNFREEZE_SUCCESS", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue() PREAUTH_UNFREEZE_SUCCESS("PREAUTH_UNFREEZE_SUCCESS", 1, "'" + ProductPaymentTypeEnum.CREDIT.getName() + "'", null, OrderStatusBitEnum.CANCELED.getValue()
+ OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATING.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATE_FAILED.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATING.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATE_FAILED.getValue()
...@@ -229,20 +255,20 @@ public enum OrderStatusEnum { ...@@ -229,20 +255,20 @@ public enum OrderStatusEnum {
.getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATED.getValue() + OrderStatusBitEnum.BARGAINED.getValue() }, "预授权解冻成功"), .getValue() + OrderStatusBitEnum.UNFREEZE_PRE_AUTHORIZATED.getValue() + OrderStatusBitEnum.BARGAINED.getValue() }, "预授权解冻成功"),
/** /**
* 等待确认发票 * 等待确认发票16785491
* 发送发票16777216 成交全部退订8192 已取消64 已付款16 确认客户2 确认产品 1
*/ */
WAITING_INVOICE("WAITING_INVOICE", 1, null, null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() WAITING_INVOICE("WAITING_INVOICE", 1, null, null, OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCTED.getValue()
+ OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.CONFIRM_INVOICE.getValue(), "&", "=", + OrderStatusBitEnum.CANCELED.getValue() + OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.CONFIRM_INVOICE.getValue(), "&", "=",
new Integer[] { OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() }, "等待确认发票"), new Integer[] { OrderStatusBitEnum.CONFIRM_PRODUCT.getValue() + OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.DEDUCTED.getValue() }, "等待确认发票"),
/** /**
* 确认发票 * 确认发票
* 发送发票16777216
*/ */
CONFIRM_INVOICE("CONFIRM_INVOICE", 1, null, null, OrderStatusBitEnum.CONFIRM_INVOICE.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.CONFIRM_INVOICE.getValue() }, "确认发票"), CONFIRM_INVOICE("CONFIRM_INVOICE", 1, null, null, OrderStatusBitEnum.CONFIRM_INVOICE.getValue(), "&", "=", new Integer[] { OrderStatusBitEnum.CONFIRM_INVOICE.getValue() }, "确认发票"),
/** /**
* 交易完成 * 交易完成 268443648
* 成交268435456 成交全部退订8192
*/ */
DEAL_FINISHED("DEAL_FINISHED", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','" DEAL_FINISHED("DEAL_FINISHED", 1, "'" + ProductPaymentTypeEnum.PREPAY.getName() + "','" + ProductPaymentTypeEnum.PREPAY_AND_DESK.getName() + "','"
+ ProductPaymentTypeEnum.DESK.getName() + "'", null, OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=", + ProductPaymentTypeEnum.DESK.getName() + "'", null, OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue() + OrderStatusBitEnum.BARGAINED.getValue(), "&", "=",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment