jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
577f8c61 1 parent d9fff53b

feat(payment): 更新支付方式枚举定义

Inline Side-by-side
Showing 3 changed files with 8 additions and 4 deletions
...@@ -6,7 +6,7 @@ public enum OnlinePayDescEnum implements BaseProtoDescEnum<OnlinePayEnum> { ...@@ -6,7 +6,7 @@ public enum OnlinePayDescEnum implements BaseProtoDescEnum<OnlinePayEnum> {
6 6
7 UNKNOWN(OnlinePayEnum.UNKNOWN, ""), 7 UNKNOWN(OnlinePayEnum.UNKNOWN, ""),
8 ONLINE(OnlinePayEnum.ONLINE, "线上支付"), 8 ONLINE(OnlinePayEnum.ONLINE, "线上支付"),
9 - OFFLINE(OnlinePayEnum.OFFLINE, "线下支付"), 9 + OFFLINE(OnlinePayEnum.OFFLINE, "套内结算"),
10 LEAVE_HOSPITAL(OnlinePayEnum.LEAVE_HOSPITAL, "出院支付"), 10 LEAVE_HOSPITAL(OnlinePayEnum.LEAVE_HOSPITAL, "出院支付"),
11 EMPLOYEE_CARD(OnlinePayEnum.EMPLOYEE_CARD, "员工卡支付"), 11 EMPLOYEE_CARD(OnlinePayEnum.EMPLOYEE_CARD, "员工卡支付"),
12 PAPER_VERIFICATION(OnlinePayEnum.PAPER_VERIFICATION, "纸质核销"), 12 PAPER_VERIFICATION(OnlinePayEnum.PAPER_VERIFICATION, "纸质核销"),
...@@ -14,7 +14,9 @@ public enum OnlinePayDescEnum implements BaseProtoDescEnum<OnlinePayEnum> { ...@@ -14,7 +14,9 @@ public enum OnlinePayDescEnum implements BaseProtoDescEnum<OnlinePayEnum> {
14 MEAL_CARD(OnlinePayEnum.MEAL_CARD, "餐卡结算"), 14 MEAL_CARD(OnlinePayEnum.MEAL_CARD, "餐卡结算"),
15 BAND_CARD(OnlinePayEnum.BAND_CARD, "POS-银行卡"), 15 BAND_CARD(OnlinePayEnum.BAND_CARD, "POS-银行卡"),
16 ALIPAY(OnlinePayEnum.ALIPAY, "POS-支付宝"), 16 ALIPAY(OnlinePayEnum.ALIPAY, "POS-支付宝"),
17 - WECHATPAY(OnlinePayEnum.WECHATPAY, "POS-微信"); 17 + WECHATPAY(OnlinePayEnum.WECHATPAY, "POS-微信"),
18 + SETTLEMENT_INSIDE_UNIT(OnlinePayEnum.SETTLEMENT_INSIDE_UNIT, "线下支付");
19 +
18 20
19 private final OnlinePayEnum protoEnum; 21 private final OnlinePayEnum protoEnum;
20 private final String desc; 22 private final String desc;
......
...@@ -86,7 +86,7 @@ enum CloseTimeType { ...@@ -86,7 +86,7 @@ enum CloseTimeType {
86 enum OnlinePayEnum { 86 enum OnlinePayEnum {
87 UNKNOWN = 0; 87 UNKNOWN = 0;
88 ONLINE = 1; //在线 88 ONLINE = 1; //在线
89 - OFFLINE = 2; //线下 89 + OFFLINE = 2; //套内
90 LEAVE_HOSPITAL = 3;//出院 90 LEAVE_HOSPITAL = 3;//出院
91 EMPLOYEE_CARD = 4; //员工卡 91 EMPLOYEE_CARD = 4; //员工卡
92 PAPER_VERIFICATION = 5; //纸质核销 92 PAPER_VERIFICATION = 5; //纸质核销
...@@ -95,6 +95,7 @@ enum OnlinePayEnum { ...@@ -95,6 +95,7 @@ enum OnlinePayEnum {
95 BAND_CARD = 8;//银行卡 95 BAND_CARD = 8;//银行卡
96 ALIPAY = 9;//支付宝 96 ALIPAY = 9;//支付宝
97 WECHATPAY = 10;//微信支付 97 WECHATPAY = 10;//微信支付
98 + SETTLEMENT_INSIDE_UNIT = 11;//线下
98 } 99 }
99 100
100 enum ServeStatusEnum { 101 enum ServeStatusEnum {
......
...@@ -115,8 +115,9 @@ enum DishSelectRuleEnum { ...@@ -115,8 +115,9 @@ enum DishSelectRuleEnum {
115 enum ModeOfPaymentEnum { 115 enum ModeOfPaymentEnum {
116 UNKNOWN = 0; 116 UNKNOWN = 0;
117 ONLINE = 1; //在线 117 ONLINE = 1; //在线
118 - OFFLINE = 2; //线下 118 + OFFLINE = 2; //套内
119 LEAVE_HOSPITAL = 3;//出院 119 LEAVE_HOSPITAL = 3;//出院
120 + SETTLEMENT_INSIDE_UNIT = 4;//线下
120 } 121 }
121 122
122 enum DishTypeEnum { 123 enum DishTypeEnum {
......