diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/enums/PaymentScenarioEnum.java b/src/main/java/au/com/royalpay/payment/manage/merchants/enums/PaymentScenarioEnum.java
new file mode 100644
index 000000000..ad64320e6
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/enums/PaymentScenarioEnum.java
@@ -0,0 +1,59 @@
+package au.com.royalpay.payment.manage.merchants.enums;
+
+/**
+ * @Author: luoyang
+ * @Date: 2019-05-29 10:30
+ */
+public enum PaymentScenarioEnum {
+ PC_WEB("101", "PC网站"),//1
+
+ MOBILE_WEB("102", "手机端网站"),//2
+
+ APP("103", "APP"),//3
+
+ WECHAT_ALIPAY_WEB("104", "微信内、支付宝内网站"),//4
+
+ MINIPROGRAM("105", "小程序"),//5
+
+ QRCODE_BOARD("201", "二维码立牌"),//6
+
+ ROYALPAY_POS("202", "Royalpay POS"),//7
+
+ CASHIER_POS("203", "收银系统"),//8
+
+ IPOS("20301", "ipos"),//9
+
+ POSPAL("20302", "pospal"),//10
+
+ AUPOS("20303", "AUS POST"),//11
+
+ OTHER("20399", "other"),//12
+
+ VENDING_MACHINE("204", "无人售货机"),//13
+
+ LOTUS("20304", "Lotus"),
+
+ AOSHANGBAO("20305", "AoShangBao"),
+
+ INFINITY("20306", "Infinity"),
+
+ EASY_CLOUD("20307", "EasyCloud"),
+
+ AOMAIKE("20308", "AoMaiKe");
+
+ private final String scenarioTypeId;
+ private final String desc;
+
+ public String getScenarioTypeId() {
+ return scenarioTypeId;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ PaymentScenarioEnum(String scenarioTypeId, String desc) {
+ this.scenarioTypeId = scenarioTypeId;
+ this.desc = desc;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/enums/paymentScenarioEnum.java b/src/main/java/au/com/royalpay/payment/manage/merchants/enums/paymentScenarioEnum.java
deleted file mode 100644
index 846516fc7..000000000
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/enums/paymentScenarioEnum.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package au.com.royalpay.payment.manage.merchants.enums;
-
-/**
- * @Author: luoyang
- * @Date: 2019-05-29 10:30
- */
-public enum paymentScenarioEnum {
- PC_WEB(1, "PC网站"),
-
- MOBILE_WEB(2, "手机端网站"),
-
- APP(3, "APP"),
-
- WECHAT_ALIPAY_WEB(4, "微信内、支付宝内网站"),
-
- MINIPROGRAM(5, "小程序"),
-
- QRCODE_BOARD(6, "二维码立牌"),
-
- ROYALPAY_POS(7,"Royalpay POS"),
-
- CASHIER_POS(8,"收银系统"),
-
- IPOS(9,"ipos"),
-
- POSPAL(10,"pospal"),
-
- AUPOS(11,"aupos"),
-
- OTHER(12,"other"),
-
- VENDING_MACHINE(13,"无人售货机");
-
- private final int scenarioTypeId;
- private final String desc;
-
- public int getScenarioTypeId() {
- return scenarioTypeId;
- }
-
- public String getDesc() {
- return desc;
- }
- paymentScenarioEnum(int scenarioTypeId, String desc) {
- this.scenarioTypeId = scenarioTypeId;
- this.desc = desc;
- }
-}
diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html
index be623f3f9..2cd8e68d6 100644
--- a/src/main/ui/merchant_application.html
+++ b/src/main/ui/merchant_application.html
@@ -522,11 +522,6 @@
ng-click="toggleClientPayDesc('20302')">
pospal
-
-
- aupos
@@ -547,6 +542,11 @@
ng-click="toggleClientPayDesc('20307')">
EasyCloud
+
+
+ Aus Post
diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index 2ee73dcf1..c7849f0c9 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -435,11 +435,6 @@
ng-click="toggleClientPayDesc('20302')">
pospal
-
+
-
+
-
+
-
+
-
+