[RoyalPay]商户来源展示

src/main/resources/application-dev.properties

@@ -1,6 +1,6 @@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.schema-name=royalpay_production
+spring.datasource.schema-name=royalpay_local
-spring.datasource.host=192.168.0.18:3306
+spring.datasource.host=192.168.0.50:3306
 spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=root

src/main/resources/application.properties

@@ -143,3 +143,9 @@ app.hanyin-secure.sftp-host=180.168.61.93
 app.hanyin-secure.sftp-port=28480
 app.hanyin-secure.sftp-username=royalpay
 app.hanyin-secure.sftp-pwd=royalpay
+
+apple.message.apns.password=
+android.message.appkey=
+apple.message.apns.file=/opt
+android.message.secret=
+app.tax.type=GST

src/main/ui/static/payment/partner/templates/simple_applications.html

@@ -43,7 +43,7 @@
                                 <th>Phone</th>
                                 <th>Email</th>
                                <!-- <th>Approve Status</th>-->
-                                <th style="max-width: 20%">Channel</th>
+                                <th>Channel</th>
                                 <th>Status</th>
                                 <th>Handle Status</th>
                                 <th>Create Time</th>
@@ -56,7 +56,19 @@
                                 <td ng-bind="apply.contact_person"></td>
                                 <td ng-bind="apply.contact_phone"></td>
                                 <td ng-bind="apply.contact_email"></td>
-                                <td ng-bind="apply.channel |cut:true:15:' ....'"></td>
+                                <td>
+                                    <span ng-if="apply.channel==10001">谷歌|Google</span>
+                                    <span ng-if="apply.channel==10002">领英|LinkedIn</span>
+                                    <span ng-if="apply.channel==10003">微信|Wechat</span>
+                                    <span ng-if="apply.channel==10004">传单手册|Flyer Manual</span>
+                                    <span ng-if="apply.channel==10005">其他媒体|Other Media</span>
+                                    <span ng-if="apply.channel==2">线下使用体验|Offline Experience</span>
+                                    <span ng-if="apply.channel==3">朋友介绍|Friend Introduction</span>
+                                    <span ng-if="apply.channel==4">商户推荐|Merchant Recommendation</span>
+                                    <span ng-if="apply.channel==5">销售推荐|Sales Recommendation</span>
+                                </td>
+
+                                </td>
                                 <td>
                                     <if ng-if="apply.agree">已申请 <span ng-if="apply.client_moniker">({{apply.client_moniker}})</span></if>
                                     <if ng-if="!apply.agree">申请失败