diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index cf3e60100..0ea6b9324 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -17,7 +17,6 @@ import au.com.royalpay.payment.core.PaymentChannelApi; import au.com.royalpay.payment.core.exceptions.EmailException; import au.com.royalpay.payment.core.exceptions.InvalidShortIdException; import au.com.royalpay.payment.core.mappers.SysClientMapper; -import au.com.royalpay.payment.core.surcharge.IncrementalChannel; import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver; import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper; import au.com.royalpay.payment.manage.appclient.beans.AppClientBean; @@ -53,6 +52,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi; import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; import au.com.royalpay.payment.tools.connections.mpsupport.exceptions.WechatException; +import au.com.royalpay.payment.tools.defines.IncrementalChannel; import au.com.royalpay.payment.tools.env.PlatformEnvironment; import au.com.royalpay.payment.tools.env.SysConfigManager; import au.com.royalpay.payment.tools.exceptions.BadRequestException; diff --git a/src/main/ui/index.html b/src/main/ui/index.html index 2d9bedac9..7962860a8 100644 --- a/src/main/ui/index.html +++ b/src/main/ui/index.html @@ -1041,7 +1041,7 @@ margin-bottom: 10%;"/>
  • - R Service + R Services
  • diff --git a/src/main/ui/static/cashback/templates/partner_cashback_records.html b/src/main/ui/static/cashback/templates/partner_cashback_records.html index cbf156d71..eb00e422f 100644 --- a/src/main/ui/static/cashback/templates/partner_cashback_records.html +++ b/src/main/ui/static/cashback/templates/partner_cashback_records.html @@ -83,8 +83,8 @@ - + {{record.order_id}} diff --git a/src/main/ui/static/images/yangmatou.jpg b/src/main/ui/static/images/yangmaimai.jpg similarity index 100% rename from src/main/ui/static/images/yangmatou.jpg rename to src/main/ui/static/images/yangmaimai.jpg diff --git a/src/main/ui/static/images/yangmatou_sign.png b/src/main/ui/static/images/yangmaimai.png similarity index 100% rename from src/main/ui/static/images/yangmatou_sign.png rename to src/main/ui/static/images/yangmaimai.png diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html index 82be10daa..f349e520a 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html @@ -47,7 +47,7 @@ margin: 4px 0px; font-size: 16px; border-bottom: 1px solid ; - border-bottom-color: #F06101; + border-bottom-color: #ffb38c; width: 90%; text-align: center; margin-left: 5%; @@ -68,9 +68,9 @@ }
    -

    R Service

    +

    R Services

    @@ -79,7 +79,7 @@
    -
    +
    @@ -87,7 +87,7 @@
    - {{service.channel+'小程序'}} + {{service.channel}}
    @@ -106,12 +106,12 @@ {{service.incremental_mode==1?service.incremental_rate_value+'%':service.total_incremental_amount}}
    -
    +
    - {{service.is_valid?'已启用':'已禁用' }} + {{service.is_valid?'已启用':'未启用' }}
    diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html index 723cf378b..ef6932fa2 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html @@ -114,7 +114,7 @@
    - {{serviceInfo.is_valid?'已启用':'已禁用' }} + {{serviceInfo.is_valid?'已启用':'未启用' }}
    @@ -139,8 +139,8 @@ ng-click="params.source='ALL';loadTradeLogs(1)">All | System | - YangMaTou2 + Yangmaimai2

    --> @@ -368,7 +368,7 @@ - + BestPay diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index af2d06af8..820d76a7c 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -196,8 +196,8 @@ - + Permissions
  • - R Service + R Services
  • diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index fb42a786d..5787b756a 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -313,8 +313,8 @@ - + Input Amount System Rate System Profit - YangMaTou Rate - YangMaTou Profit + YangMaiMai Rate + YangMaiMai Profit Status Create Time Operation @@ -365,8 +365,8 @@ - + All | System | - YangMaTou2 + Yangmaimai2

    --> @@ -330,7 +330,7 @@ - + BestPay diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html index 463d2931c..8d7002b93 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html @@ -220,7 +220,7 @@ - + {{tr.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html index ad16da97c..be6c72794 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html @@ -117,8 +117,8 @@ ng-click="params.source='ALL';loadTradeLogs(1)">All | System | - YangMaTou + YangMaiMai

    @@ -420,7 +420,7 @@ - + BestPay diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 77b3ec4f9..e8547b206 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -150,8 +150,8 @@ ng-click="params.source='ALL';loadTradeLogs(1)">All | System | - YangMaTou + YangMaiMai

    @@ -464,8 +464,8 @@ - + ' + '
    手续费组成
    '+'
    '+ '

    system:'+ system_surcharge +'

    ' + - '

    yangmatou:'+ incremental_surcharge +'

    ' + + '

    yangmaimai:'+ incremental_surcharge +'

    ' + '

    tax amount:'+ tax_amount +'

    ' + ''); } @@ -297,7 +297,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { app.controller('IncrementalTradeLogCtrl', ['$scope', '$http', '$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog', function ($scope, $http, $filter, $timeout, partnerRefunder, orderService, commonDialog) { - $scope.params = {source: 'yangmatou',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()}; + $scope.params = {source: 'yangmaimai',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()}; $scope.pagination = {}; $scope.today = new Date(); $scope.isAll = true;