Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

src/db/modify.sql

@@ -677,3 +677,8 @@ ADD COLUMN `wechat_institution_merchant_id`  varchar(6) NULL AFTER `wechat_insti
 ALTER TABLE `log_client_sub_merchant_id`
 ADD COLUMN `wechat_institution_merchant_id`  varchar(6) NULL AFTER `client_id`;
 
+
+INSERT INTO `sys_configs` VALUES ('payment.ali.individual_daily_limit', null);
+INSERT INTO `sys_configs` VALUES ('payment.ali.individual_yearly_limit', null);
+INSERT INTO `sys_configs` VALUES ('payment.ali.per_order_limit', null);
+

src/main/ui/static/analysis/templates/cheat_monitor_risk.html

@@ -200,6 +200,29 @@
 
                     </div>
                 </div>
+                <div class="panel panel-success">
+                    <div class="panel-heading">支付宝支付限额</div>
+                    <div class="panel-body">
+                        <div class="form-group col-sm-6">
+                            <label class="control-label col-sm-4" for="wechat-max-per-order">支付宝每笔订单金额</label>
+                            <div class="col-sm-6">
+                                <input id="ali-max-per-order" class="form-control" ng-model="paymentconfig['payment.ali.per_order_limit']">
+                            </div>
+                        </div>
+                        <div class="form-group col-sm-6">
+                            <label class="control-label col-sm-4" for="wechat_individual_daily_limit">支付宝单人单日限额</label>
+                            <div class="col-sm-6">
+                                <input id="ali_individual_daily_limit" class="form-control" ng-model="paymentconfig['payment.ali.individual_daily_limit']">
+                            </div>
+                        </div>
+                        <div class="form-group col-sm-6">
+                            <label class="control-label col-sm-4" for="wechat_individual_yearly_limit">支付宝单人每年限额</label>
+                            <div class="col-sm-6">
+                                <input id="ali_individual_yearly_limit" class="form-control" ng-model="paymentconfig['payment.ali.individual_yearly_limit']">
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="panel panel-success">
                     <div class="panel-heading">用户关单率检测 <span class="small text-red">检测用户当日订单</span></div>
                     <div class="panel-body">