Revert "add rpoy+"

This reverts commit 94aa36f657.

pom.xml

@@ -36,10 +36,6 @@
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>jd-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>au.com.royalpay.payment</groupId>
-            <artifactId>rpay-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.stuxuhai</groupId>
             <artifactId>jpinyin</artifactId>

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

@@ -330,7 +330,4 @@ public interface ClientManager {
     void sendHfEmailNotice(JSONObject order);
 
     void updateAllPartnerPassword(String clientMoniker, List<String> emails);
-
-    String subRpayMerchantApplication(String clientMoniker, JSONObject manager);
-
 }

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

@@ -1,13 +1,10 @@
 package au.com.royalpay.payment.manage.merchants.core.impls;
 
-import au.com.royalpay.payment.channels.jd.runtime.RpayApi;
-import au.com.royalpay.payment.channels.jd.runtime.beans.SubRpayMerchantInfo;
 import au.com.royalpay.payment.channels.wechat.config.WeChatPayConfig;
 import au.com.royalpay.payment.channels.wechat.config.WechatPayEnvironment;
 import au.com.royalpay.payment.channels.wechat.runtime.MpPaymentApi;
 import au.com.royalpay.payment.channels.wechat.runtime.WxPayClient;
 import au.com.royalpay.payment.channels.wechat.runtime.beans.SubMerchantInfo;
-
 import au.com.royalpay.payment.core.PaymentChannelApi;
 import au.com.royalpay.payment.core.beans.PayChannel;
 import au.com.royalpay.payment.core.exceptions.EmailException;
@@ -234,9 +231,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Resource
     private WxPayClient wxPayClient;
 
-    @Resource
-    private RpayApi rpayApi;
-
     @Resource
     private ManagerMapper managerMapper;
     @Resource
@@ -1559,7 +1553,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         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, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
 
         configNewClientRate(config, clientId, "Wechat", "wechat_rate_value", org, "min_wechat_rate");
         configNewClientRate(config, clientId, "Alipay", "alipay_rate_value", org, "min_alipay_rate");
@@ -1567,7 +1560,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         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, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
 
     }
 
@@ -3535,32 +3527,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         return sub_merchant_id;
     }
 
-    @Override
-    public String subRpayMerchantApplication(String clientMoniker, JSONObject manager) {
-        JSONObject client = getClientInfoByMoniker(clientMoniker);
-        if (client == null) {
-            throw new InvalidShortIdException();
-        }
-        checkOrgPermission(manager, client);
-
-        SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(client, SubRpayMerchantInfo.class);
-        rpayApi.registerMerchant(client.getIntValue("client_id"), subRpayMerchantInfo);
-
-        logger.debug("访问成功，返回的信息是：   "  );
-
-
-
-       // String sub_merchant_id = elem.elementText("sub_mch_id");
-/*        if (StringUtils.isNotEmpty(sub_merchant_id)) {
-
-
-
-        } else {
-            throw new BadRequestException("请求失败");
-        }*/
-        return null;
-    }
-
     @Override
     public List<JSONObject> listMerchantIds(String clientMoniker, JSONObject manager) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);

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

@@ -154,7 +154,6 @@ public class PartnerManageController {
     public void updatePartnerPaymentConfig(@PathVariable String clientMoniker, @RequestBody JSONObject subMerchantInfo, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         clientManager.updateClientPaymentConfig(manager, clientMoniker, subMerchantInfo);
     }
-
     @ManagerMapping(value = "/{clientMoniker}/ali_sub_merchant_id", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR})
     public void updateAliSubMerchantId(@PathVariable String clientMoniker, @RequestBody JSONObject aliSubMerchantInfo, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         clientManager.updateAliSubMerchantId(manager, clientMoniker, aliSubMerchantInfo);
@@ -532,7 +531,6 @@ public class PartnerManageController {
     public List<JSONObject> getClientSubMerchantIdLogs(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         return clientManager.getClientSubMerchantIdLogs(clientMoniker,manager);
     }
-
     @ManagerMapping(value = "/unsub/{clientMoniker}",method = RequestMethod.PUT,role = {ManagerRole.OPERATOR})
     public void addSub(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
          clientManager.addSub(clientMoniker,manager);
@@ -553,10 +551,4 @@ public class PartnerManageController {
         clientManager.switchPermission(manager, clientMoniker, "enable_hf_email_notice", pass.getBooleanValue("allow"));
     }
 
-    @ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
-    public String subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        return clientManager.subRpayMerchantApplication(clientMoniker, manager);
-    }
-
-
 }

src/main/resources/application-rpay.properties

@@ -1,3 +0,0 @@
-app.privateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKikZJwvKZ3dj5QsRy6xN/cPinAZa3leg8X40YzGrMEYWc2nmZY/EczYPq/kUp1uL2uikweDO35fuVpA4rALmJwXhHzsZyhVk4lEjHaqH8rNpVpmrwKP9rMmbFD23Mfvvt+BkKWan2T2dAMbSdjPY0+DTS4sN1ZrqzycRFxKFpohAgMBAAECgYBoO0Mb7WJxehFV6ZANYedPQkG0S2HL4AjeAY2yztDTf/NxUpdw74ZW74i/OgV93C5e/lqVmBzbXNq418XEPUaSohOqbcv+QRlEdlTAtn82aAUp/c9oSogPiHWs2VKiGoutejwVXQ6V9BAGMMegLwVphUu9dgrPC4dnfGO11fvLiQJBANt0VPmdqdG52rNVllKhF5+d+dIamOOQewWZf7HnkW0uYt9kWSbZCYyey4nP7NlONL7NEdUxn9exg/DYzegB99sCQQDEudve+jV2Ay6gbOS+ylHoCxSroF6jlkBQ0q7LIsWAAzIVLOuo5skC+wJmHzKXDoQBLXcFerP/T/iUSzisKqSzAkEAmjRVXY02/gLttWQnm+pMckGMgOFlm0oz18xzmSwR2TlmCnk12AFcH26ZsT3kvRGiKIxqwnb7TZIUF1IQ5b00TwJALD7xKNF1vLkyf3p+aDrw+ROk7oT/RCPDC2qXTbDgYs5VMVYNGsvtYfI6s+VIZ5koL2ueXWkfmsjNy+yvLmnY6QJADV9xlAa1+mWN2TfzAugd3L0fNLqPJPHBKQS5/bBKcoZlwfXwByrcCceKaCntJRZ056eQ7IeqkJfxjkEo/kgaRg==
-app.rpayPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw4QOJdajtax5/EQ/Tm65tLnaRB3LXrac3jhdOGp+PsQL1tQyRnvKfWDD5qJ2VZ+rSsLUGg//7ubHtuQHFgH8N9BfSDf9PSZLXsgdA0ikAj6/0P+D7VsSAGsw97plXElh3jx1OvKIW46ZFtPgXuotTx1B+4plafhv5JMHMcVYwOGghaDH9Yoh4vaVU6JNw7IWATaycrmAwEns5VVN6uvz2aTYsH8Rb4j2PA8oKW+7ckcF+sCTNJhFK29iHcvLwzGTXrUTaOfk3ZXNhB9g1ou9aolDszUKvj1R7gSoyoq05w6ICno/d0Fu6Oj0H1N36k7OjUt3wX2lm40yu6ymEV6U0QIDAQAB
-app.appId=1c8990fa-7568-49f0-b1c2-eee77b3b70be

src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=5000
 
-spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay
+spring.profiles.active=dev,alipay,bestpay,jd,wechat
 
 env.company=RoyalPay
 

src/main/ui/static/payment/partner/partner-manage.js

@@ -1888,7 +1888,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         $scope.rate.bestpay_rate_value = parseFloat($scope.sysRateConfig.t1.Bestpay);
                         $scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t1.JDpay);
                         $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t1.HFpay);
-                        $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t1.Rpay);
                         break;
                     }
                     case '2': {
@@ -1898,7 +1897,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t2.AlipayOnline);
                         $scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t2.JDpay);
                         $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t2.HFpay);
-                        $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t2.Rpay);
                         break;
                     }
                     case '3': {
@@ -1908,7 +1906,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t3.AlipayOnline);
                         $scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t3.JDpay);
                         $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t3.HFpay);
-                        $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t3.Rpay);
                         break;
                     }
                 }
@@ -3097,10 +3094,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
             });
         }
-        $scope.applyWxSubMerchantId = function () {
+        $scope.applySubMerchantId = function () {
             $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/apply_wx_sub_merchant_id.html',
+                templateUrl: '/static/payment/partner/templates/apply_sub_merchant_id.html',
-                controller: 'applyWxSubMerchantIdCtrl',
+                controller: 'applySubMerchantIdCtrl',
                 resolve: {
                     subMerchantInfo: function () {
                         return $scope.partner;
@@ -3112,26 +3109,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }).result.then(function () {
                 $scope.loadSubMerchantInfos();
             })
-        };
-        $scope.applyRpaySubMerchantId = function () {
-            $http.post('/sys/partners/' + $scope.partner.client_moniker + '/registRpaySubMerchantId').then(function (resp) {
-                commonDialog.alert({
-                    title: 'Success',
-                    content: 'Modify Wechat Sub Merchant ID successfully',
-                    type: 'success'
-                });
-                $state.reload();
-            }, function (resp) {
-                commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
-            });
-
-
-
-
         };
         $scope.loadSubMerchantInfos();
     }]);
-    app.controller('applyWxSubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog) {
+    app.controller('applySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog) {
         $scope.wxIndustries = angular.copy(wxMerchantIndustries);
         $scope.subMerchantInfo = angular.copy(subMerchantInfo);
         $scope.merchantIds = merchantIds.data;

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

@@ -171,7 +171,6 @@
             <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=='Rpay'}"><a role="button" ng-click="bankCtrl.rate_name='Rpay'">Rpay+</a></li>
         </ul>
         <div class="table-responsive">
             <table class="table table-bordered">

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

@@ -255,7 +255,7 @@
                         <a ui-sref=".product">Product</a>
                     </li>
                     <li ui-sref-active="active" ng-if="('10'|withRole) && partner.is_valid==1">
-                        <a ui-sref=".sub_merchant_applicaitons">Merchant Id Applicaitons</a>
+                        <a ui-sref=".sub_merchant_applicaitons">Wechat Merchant Id Applicaitons</a>
                     </li>
                     <li ui-sref-active="active" ng-if="partner.is_valid==1">
                         <a ui-sref=".permission_client">Permissions</a>

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

@@ -160,30 +160,6 @@
                     </div>
                 </div>
 
-                <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="Rpay_rate_value_input">Rpay+ Rate Value</label>
-                    <div class="col-sm-6">
-                        <div class="input-group">
-                            <input type="number" name="jd_rate_value" stringToNumber2 class="form-control" ng-model="rate.Rpay_rate_value"
-                                   min="0.6" max="2.2" step="0.1" id="Rpay_rate_value_input" required>
-                            <div class="input-group-addon">%</div>
-                        </div>
-                        <div ng-messages="rate_form.hf_rate_value.$error" ng-if="rate_form.hf_rate_value.$dirty">
-                            <div class="small text-danger" ng-message="max">
-                                <i class="glyphicon glyphicon-alert"></i> No more than 2.2%
-                            </div>
-                            <div class="small text-danger" ng-message="min">
-                                <i class="glyphicon glyphicon-alert"></i> No less than 0.6%
-                            </div>
-                            <div class="small text-danger" ng-message="required">
-                                <i class="glyphicon glyphicon-alert"></i> Required Field
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label class="control-label col-sm-4" for="active_time_input">Active Date</label>
                     <div class="col-sm-6">

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

@@ -31,24 +31,11 @@
                 <div class="box box-warning">
                     <div class="box-header">
                         <h3 class="box-title pull-left" ng-if="partner.sub_merchant_id">
-                            Wechat Sub Merchant Id : {{partner.sub_merchant_id}}
+                            Sub Merchant Id : {{partner.sub_merchant_id}}
                             <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
                         </h3>
                         <button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
-                                ng-click="applyWxSubMerchantId()">
+                                ng-click="applySubMerchantId()">
-                            <i class="fa fa-plus"></i>
-                            Apply Sub Merchant Id
-                        </button>
-                    </div>
-                </div>
-                <div class="box box-warning">
-                    <div class="box-header">
-                        <h3 class="box-title pull-left" ng-if="partner.sub_merchant_id">
-                            Rpay+ Sub Merchant Id : {{partner.sub_merchant_id}}
-                            <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
-                        </h3>
-                        <button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
-                                ng-click="applyRpaySubMerchantId()">
                             <i class="fa fa-plus"></i>
                             Apply Sub Merchant Id
                         </button>