Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java

@@ -376,4 +376,6 @@ public interface ClientManager {
     void switchCBBankLink(JSONObject manager, String clientMoniker, boolean allow);
 
     String cbBankPayLink(String clientMoniker);
+
+    void switchPaymentConfigPC(String clientMoniker, HttpServletResponse response) throws IOException;
 }

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -1614,9 +1614,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         checkAddRate(config, "AlipayOnline", "alipayonline_rate_value", org, "min_alipayonline_rate");
         checkAddRate(config, "Bestpay", "bestpay_rate_value", org, "min_bestpay_rate");
         checkAddRate(config, "jd", "jd_rate_value", org, "min_jd_rate");
-        checkAddRate(config, "hf", "hf_rate_value", org, "min_hf_rate");
+//        checkAddRate(config, "hf", "hf_rate_value", org, "min_hf_rate");
         checkAddRate(config, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
-        checkAddRate(config, "Yeepay", "yeepay_rate_value", org, "min_yeepay_rate");
+//        checkAddRate(config, "Yeepay", "yeepay_rate_value", org, "min_yeepay_rate");
         checkAddRate(config, "CB_BankPay", "min_cb_bankpay_value", org, "min_cb_bankpay_rate");
 
         configNewClientRate(config, clientId, "Wechat", "wechat_rate_value", org, "min_wechat_rate");
@@ -1624,9 +1624,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configNewClientRate(config, clientId, "AlipayOnline", "alipayonline_rate_value", org, "min_alipayonline_rate");
         configNewClientRate(config, clientId, "Bestpay", "bestpay_rate_value", org, "min_bestpay_rate");
         configNewClientRate(config, clientId, "jd", "jd_rate_value", org, "min_jd_rate");
-        configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
+//        configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
         configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
-        configNewClientRate(config, clientId, "Yeepay", "yeepay_rate_value", org, "min_yeepay_rate");
+//        configNewClientRate(config, clientId, "Yeepay", "yeepay_rate_value", org, "min_yeepay_rate");
         configNewClientRate(config, clientId, "CB_BankPay", "cb_bankpay_rate_value", org, "min_cb_bankpay_rate");
         //todo 暂不更新Rpay+ 费率信息
         //rpayApi.modifySurchargeConfig(client);
@@ -4281,7 +4281,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         checkOrgPermission(manager, client);
         if (StringUtils.isEmpty(client.getString("cb_bankpay_url"))) {
-            String longUrl = PlatformEnvironment.getEnv().concatUrl("/sys/partners/" + client.getString("client_moniker") + "/cb_bankpay/link");
+            String longUrl = PlatformEnvironment.getEnv().concatUrl("/sys/partners/" + client.getString("client_moniker") + "/cb_bankpay/link/pc");
             String cb_bankpay_url = getCBBankShortLink(longUrl);
             client.put("cb_bankpay_url", cb_bankpay_url);
             client.put("enable_cb_bankpay_link", allow);
@@ -4305,6 +4305,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         return String.format(PlatformEnvironment.getEnv().concatUrl(paymentConfig.getString("path")), clientMoniker);
     }
 
+    @Override
+    public void switchPaymentConfigPC(String clientMoniker, HttpServletResponse response) throws IOException {
+        JSONObject client = clientMapper.findClientByMoniker(clientMoniker);
+        if (client == null) {
+            throw new BadRequestException("partner code is not exists!");
+        }
+        JSONObject paymentConfig = sysChannelConfigMapper.findOne(1);
+        if (paymentConfig == null) {
+            throw new BadRequestException("服务商未开启快捷支付");
+        }
+        String path = paymentConfig.getString("path");
+        path = path.replaceAll("app","pc");
+        response.sendRedirect(String.format(PlatformEnvironment.getEnv().concatUrl(path), clientMoniker));
+    }
+
     private TemplateMessage initClientMessage(JSONObject client, String newExpiryDate, String wechatOpenid, String templateId) {
         TemplateMessage notice = new TemplateMessage(wechatOpenid, templateId, null);
         notice.put("first", "您好，您的合同费率已到期，根据合同协议系统已自动为您延期1年。", "#ff0000");

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java

@@ -636,4 +636,9 @@ public class PartnerManageController {
     public String jumpCBBankPayLink(@PathVariable String clientMoniker) {
         return clientManager.cbBankPayLink(clientMoniker);
     }
+
+    @RequestMapping(value = "/{clientMoniker}/cb_bankpay/link/pc", method = RequestMethod.GET)
+    public void switchPaymentWayPC(@PathVariable String clientMoniker, HttpServletResponse response) throws IOException {
+        clientManager.switchPaymentConfigPC(clientMoniker, response);
+    }
 }

src/main/ui/static/config/organizations/templates/new_org.html

@@ -179,7 +179,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group"
+                            <!--<div class="form-group"
                                  ng-class="{'has-error':org_form.hf_rate_value.$invalid && org_form.hf_rate_value.$dirty}">
                                 <label class="control-label col-sm-2" for="hf_rate_value_input">HF Rate *</label>
                                 <div class="col-sm-8">
@@ -190,8 +190,8 @@
                                         <span class="input-group-addon">%</span>
                                     </div>
                                 </div>
-                            </div>
+                            </div>-->
-                            <div class="form-group"
+                            <!--<div class="form-group"
                                  ng-class="{'has-error':org_form.yeepay_rate_value.$invalid && org_form.yeepay_rate_value.$dirty}">
                                 <label class="control-label col-sm-2" for="yeepay_rate_value_input">Yeepay Rate *</label>
                                 <div class="col-sm-8">
@@ -202,7 +202,7 @@
                                         <span class="input-group-addon">%</span>
                                     </div>
                                 </div>
-                            </div>
+                            </div>-->
                             <div class="form-group"
                                  ng-class="{'has-error':org_form.cb_bankpay_rate_value.$invalid && org_form.cb_bankpay_rate_value.$dirty}">
                                 <label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CB BankPay Rate *</label>
@@ -279,7 +279,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group"
+                            <!--<div class="form-group"
                                  ng-class="{'has-error':org_form.min_hf_rate.$invalid && org_form.min_hf_rate.$dirty}">
                                 <label class="control-label col-sm-2" for="min_hf_rate_input">Min HF Rate *</label>
                                 <div class="col-sm-8">
@@ -290,8 +290,8 @@
                                         <span class="input-group-addon">%</span>
                                     </div>
                                 </div>
-                            </div>
+                            </div>-->
-                            <div class="form-group"
+                            <!--<div class="form-group"
                                  ng-class="{'has-error':org_form.min_yeepay_rate.$invalid && org_form.min_yeepay_rate.$dirty}">
                                 <label class="control-label col-sm-2" for="min_yeepay_rate_input">Min Yeepay Rate *</label>
                                 <div class="col-sm-8">
@@ -302,7 +302,7 @@
                                         <span class="input-group-addon">%</span>
                                     </div>
                                 </div>
-                            </div>
+                            </div>-->
                             <div class="form-group"
                                  ng-class="{'has-error':org_form.min_cb_bankpay_rate.$invalid && org_form.min_cb_bankpay_rate.$dirty}">
                                 <label class="control-label col-sm-2" for="min_cb_bankpay_rate_input">Min CB BankPay Rate *</label>

src/main/ui/static/config/organizations/templates/org_detail.html

@@ -152,7 +152,7 @@
                                             <span class="input-group-addon form-control-span">%</span>
                                         </div>
                                     </div>
-                                    <div class="form-group" ng-class="{'has-error':org_form.hf_rate_value.$invalid && org_form.hf_rate_value.$dirty}">
+                                    <!--<div class="form-group" ng-class="{'has-error':org_form.hf_rate_value.$invalid && org_form.hf_rate_value.$dirty}">
                                         <label class="control-label col-sm-2" for="hf_rate_value_input">HF Rate *</label>
                                         <div class="col-sm-8">
                                             <input class="form-control form-control-float" type="number" ng-model="org.hf_rate_value" id="hf_rate_value_input" name="hf_rate_value" max="100" min="0">
@@ -165,7 +165,7 @@
                                             <input class="form-control form-control-float" type="number" ng-model="org.yeepay_rate_value" id="yeepay_rate_value_input" name="yeepay_rate_value" max="100" min="0">
                                             <span class="input-group-addon form-control-span">%</span>
                                         </div>
-                                    </div>
+                                    </div>-->
                                     <div class="form-group" ng-class="{'has-error':org_form.cb_bankpay_rate_value.$invalid && org_form.cb_bankpay_rate_value.$dirty}">
                                         <label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CB BankPay Rate *</label>
                                         <div class="col-sm-8">
@@ -225,7 +225,7 @@
                                             <span class="input-group-addon form-control-span">%</span>
                                         </div>
                                     </div>
-                                    <div class="form-group"
+                                    <!--<div class="form-group"
                                          ng-class="{'has-error':org_form.min_hf_rate.$invalid && org_form.min_hf_rate.$dirty}">
                                         <label class="control-label col-sm-2" for="min_hf_rate_input">Min HF Rate *</label>
                                         <div class="col-sm-8">
@@ -242,7 +242,7 @@
                                                    id="min_yeepay_rate_input" name="min_yeepay_rate" max="100" min="0">
                                             <span class="input-group-addon form-control-span">%</span>
                                         </div>
-                                    </div>
+                                    </div>-->
                                     <div class="form-group"
                                          ng-class="{'has-error':org_form.min_cb_bankpay_rate.$invalid && org_form.min_cb_bankpay_rate.$dirty}">
                                         <label class="control-label col-sm-2" for="min_yeepay_rate_input">Min CB BankPay Rate *</label>

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

@@ -170,9 +170,9 @@
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='AlipayOnline'}"><a role="button" ng-click="bankCtrl.rate_name='AlipayOnline'">Alipay(Online)</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Bestpay'}"><a role="button" ng-click="bankCtrl.rate_name='Bestpay'">Bestpay</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='jd'}"><a role="button" ng-click="bankCtrl.rate_name='jd'">JDpay</a></li>
-            <li role="presentation" ng-class="{active:bankCtrl.rate_name=='hf'}"><a role="button" ng-click="bankCtrl.rate_name='hf'">HFpay</a></li>
+            <!--<li role="presentation" ng-class="{active:bankCtrl.rate_name=='hf'}"><a role="button" ng-click="bankCtrl.rate_name='hf'">HFpay</a></li>-->
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Rpay'}"><a role="button" ng-click="bankCtrl.rate_name='Rpay'">Rpay+</a></li>
-            <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Yeepay'}"><a role="button" ng-click="bankCtrl.rate_name='Yeepay'">Yeepay</a></li>
+            <!--<li role="presentation" ng-class="{active:bankCtrl.rate_name=='Yeepay'}"><a role="button" ng-click="bankCtrl.rate_name='Yeepay'">Yeepay</a></li>-->
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='CB_BankPay'}"><a role="button" ng-click="bankCtrl.rate_name='CB_BankPay'" ng-if="sysconfig.active_channels.indexOf('CB_BankPay')!=-1">CB_BankPay</a></li>
         </ul>
         <div class="table-responsive">

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

@@ -112,7 +112,7 @@
                     </div>
                 </div>
 
-                <div class="form-group"
+                <!--<div class="form-group"
                      ng-class="{'has-error':rate_form.hf_rate_value.$invalid && rate_form.hf_rate_value.$dirty}">
                     <label class="control-label col-sm-4" for="hf_rate_value_input">HF Rate Value</label>
                     <div class="col-sm-6">
@@ -134,7 +134,7 @@
                         </div>
 
                     </div>
-                </div>
+                </div>-->
 
                 <div class="form-group"
                      ng-class="{'has-error':rate_form.Rpay_rate_value.$invalid && rate_form.Rpay_rate_value.$dirty}">
@@ -160,7 +160,7 @@
                     </div>
                 </div>
 
-                <div class="form-group"
+                <!--<div class="form-group"
                      ng-class="{'has-error':rate_form.yeepay_rate_value.$invalid && rate_form.yeepay_rate_value.$dirty}">
                     <label class="control-label col-sm-4" for="yeepay_rate_value_input">Yeepay Rate Value</label>
                     <div class="col-sm-6">
@@ -182,18 +182,18 @@
                         </div>
 
                     </div>
-                </div>
+                </div>-->
                 <!--快捷支付费率-->
                 <div class="form-group"
                      ng-class="{'has-error':rate_form.cb_bankpay_rate_value.$invalid && rate_form.cb_bankpay_rate_value.$dirty}">
-                    <label class="control-label col-sm-4" for="yeepay_rate_value_input">CB BankPay Rate Value</label>
+                    <label class="control-label col-sm-4" for="cb_bankpay_rate_value_input">CB BankPay Rate Value</label>
                     <div class="col-sm-6">
                         <div class="input-group">
                             <input type="number" name="cb_bankpay_rate_value" stringToNumber2 class="form-control" ng-model="rate.cb_bankpay_rate_value"
                                    min="0.6" max="5.0" step="0.1" id="cb_bankpay_rate_value_input" required>
                             <div class="input-group-addon">%</div>
                         </div>
-                        <div ng-messages="rate_form.yeepay_rate_value.$error" ng-if="rate_form.cb_bankpay_rate_value.$dirty">
+                        <div ng-messages="rate_form.cb_bankpay_rate_value.$error" ng-if="rate_form.cb_bankpay_rate_value.$dirty">
                             <div class="small text-danger" ng-message="max">
                                 <i class="glyphicon glyphicon-alert"></i> No more than 5.0%
                             </div>

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

@@ -211,7 +211,7 @@
                     <input type="checkbox" ng-model="paymentInfo.enable_jd" bs-switch switch-change="toggleChannel('jd')">
                 </div>
             </div>
-            <div class="form-group col-sm-4">
+            <!--<div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">HF|汇付</label>
                 <div class="col-xs-6">
                     <input type="checkbox" ng-model="paymentInfo.enable_hf" bs-switch switch-change="toggleChannel('hf')">
@@ -222,7 +222,7 @@
                 <div class="col-xs-6">
                     <input type="checkbox" ng-model="paymentInfo.enable_yeepay" bs-switch switch-change="toggleChannel('yeepay')">
                 </div>
-            </div>
+            </div>-->
             <div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">CB BankPay|快捷支付</label>
                 <div class="col-xs-6">
@@ -351,7 +351,7 @@
                     </p>
                 </div>
             </div>
-            <hr>
+            <!--<hr>
             <div class="form-group">
                 <label class="col-sm-2 control-label">HF Pay Link</label>
                 <div class="col-sm-10">
@@ -396,7 +396,7 @@
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.enable_yeepay_email_notice" bs-switch switch-change="toggleGatewayEmailNotice('yeepay')">
                 </div>
-            </div>
+            </div>-->
         </div>
     </div>
 </div>