From d68c51437646cf594983c99ada1ec955ecb694b3 Mon Sep 17 00:00:00 2001 From: Todking Date: Tue, 14 Sep 2021 16:57:27 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9Eaps=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=9A=84=E8=B4=B9=E7=8E=87=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../merchants/core/ApsConfigService.java | 2 +- .../core/impls/ApsConfigServiceImpl.java | 2 +- .../core/impls/ClientManagerImpl.java | 66 +- .../ApsConfigDescriptor.java | 4 +- .../merchants/entity/ApsConfigData.java | 4 +- .../merchants/web/ApsConfigController.java | 10 +- .../manage/organizations/beans/OrgInfo.java | 32 + .../organizations/templates/org_detail.html | 1954 +++++++++-------- .../templates/org_detail_parent.html | 34 + .../templates/partner_bankaccounts.html | 261 +-- 10 files changed, 1276 insertions(+), 1093 deletions(-) rename src/main/java/au/com/royalpay/payment/manage/merchants/{core/descriptor => deacriptor}/ApsConfigDescriptor.java (71%) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java index 6fa193b6d..3441146e0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java @@ -1,6 +1,6 @@ package au.com.royalpay.payment.manage.merchants.core; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java index 6444876b4..d06b65bb6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.merchants.core.impls; import au.com.royalpay.payment.manage.mappers.system.aps.ApsConfigMapper; import au.com.royalpay.payment.manage.merchants.core.ApsConfigService; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; 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 af0999d69..7626d6460 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 @@ -62,7 +62,7 @@ import au.com.royalpay.payment.manage.merchants.core.*; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBank; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBankClientNullException; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBankInfo; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import au.com.royalpay.payment.manage.merchants.entity.impls.*; import au.com.royalpay.payment.manage.merchants.enums.UPayAuthFileEnum; @@ -564,7 +564,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid apsConfig = apsConfigService.saveApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), new ApsConfigDescriptor()); } client.put("aps_config_id", apsConfig.getId()); - client.put("enable_alipayaps", apsConfig.getEnableAlipayAps()); client.put("alipay_cn_switch", apsConfig.getAlipayCnSwitch()); return client; } @@ -1594,17 +1593,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new NotFoundException("Client Not Exists"); } - if (channelApi.channel().equalsIgnoreCase("alipayaps")) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("enableAlipayAps", allow); - apsConfigService.updateApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), jsonObject); - } else { - merchantChannelPermissionManager.switchMerchantChannelPermission(channelApi.getMetadata().payChannel(), client.getIntValue("client_id"), allow); - try { - clientModifySupport.processModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow)); - } catch (Exception e) { - logger.error("Failed to change channel switch:{}", channel); - } + merchantChannelPermissionManager.switchMerchantChannelPermission(channelApi.getMetadata().payChannel(), client.getIntValue("client_id"), allow); + try { + clientModifySupport.processModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow)); + } catch (Exception e) { + logger.error("Failed to change channel switch:{}", channel); } logger.info("{}({}) switched client {} channel {} to {}", manager.getString("display_name"), manager.getString("manager_id"), clientMoniker, channel, allow); if (allow && (StringUtils.equalsAnyIgnoreCase("Wechat", channel) || StringUtils.equalsAnyIgnoreCase("Alipay", channel))) { @@ -2085,8 +2078,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (newConfig.getBigDecimal("cb_bankpay_rate_value") != null) { clientRateMapper.saveRate(newConfig); } - } else if("AlipayAps".equalsIgnoreCase(channel)){ - newConfig.put("transaction_fee",newConfig.getFloatValue("service_fee_value")); + } else if ("AlipayAps".equalsIgnoreCase(channel)) { + newConfig.put("transaction_fee", newConfig.getFloatValue("service_fee_value")); clientRateMapper.saveRate(newConfig); } else { clientRateMapper.saveRate(newConfig); @@ -7091,6 +7084,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid /** * alipayplus(aps) 注册商户 + * * @param clientMoniker * @param apsMerchantApplication * @param manager @@ -7098,40 +7092,40 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid */ @Override public MerchantApplicationResult alipayPlusRegisterMerchant(String clientMoniker, ApsMerchantApplication apsMerchantApplication, JSONObject manager) { - logger.info("====>getWebsiteType:"+apsMerchantApplication.getWebsiteType()); - logger.info("====>getProductCodes:"+apsMerchantApplication.getProductCodes().toString()); - boolean offline = apsMerchantApplication.getProductCodes().stream().allMatch(s->s.equalsIgnoreCase(ProductCodeType.IN_STORE_PAYMENT.toString())); - logger.info("====>offline:"+offline); - if(offline){ + logger.info("====>getWebsiteType:" + apsMerchantApplication.getWebsiteType()); + logger.info("====>getProductCodes:" + apsMerchantApplication.getProductCodes().toString()); + boolean offline = apsMerchantApplication.getProductCodes().stream().allMatch(s -> s.equalsIgnoreCase(ProductCodeType.IN_STORE_PAYMENT.toString())); + logger.info("====>offline:" + offline); + if (offline) { //todo 测试需要 先都改成线上,上线此处需要改成线下 - apsMerchantApplication.setPid( AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid()); - }else{ - apsMerchantApplication.setPid( AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid()); - } + apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid()); + } else { + apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid()); + } apsMerchantApplication.setRegion("AU"); - JSONObject client= sysClientMapper.findClientByMoniker(clientMoniker); + JSONObject client = sysClientMapper.findClientByMoniker(clientMoniker); AlipayApsMerchantRegister alipayApsMerchantRegister = Optional.ofNullable(merchantChannelApplicationManager.getRegister(AlipayApsMerchantRegister.class)).orElseThrow(() -> new ServerErrorException("No AlipayAps registry found")); - MerchantApplicationResult result=alipayApsMerchantRegister.apply(client,apsMerchantApplication,manager); + MerchantApplicationResult result = alipayApsMerchantRegister.apply(client, apsMerchantApplication, manager); return result; } @Override - public String queryAlipayPlusOnlineStatus(boolean isRetail,String clientMoniker, JSONObject manager) { - JSONObject client= sysClientMapper.findClientByMoniker(clientMoniker); - client.put("isRetail",isRetail); - String pid=""; - if(isRetail){ + public String queryAlipayPlusOnlineStatus(boolean isRetail, String clientMoniker, JSONObject manager) { + JSONObject client = sysClientMapper.findClientByMoniker(clientMoniker); + client.put("isRetail", isRetail); + String pid = ""; + if (isRetail) { //todo 测试需要 先都改成线上,上线此处需要改成线下 - pid= AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid(); - }else{ - pid= AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid(); + pid = AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid(); + } else { + pid = AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid(); } - client.put("pid",pid); + client.put("pid", pid); AlipayApsMerchantRegister alipayApsMerchantRegister = Optional.ofNullable(merchantChannelApplicationManager.getRegister(AlipayApsMerchantRegister.class)).orElseThrow(() -> new ServerErrorException("No AlipayAps registry found")); - AlipayPlusRegisterResult alipayPlusRegisterResult= alipayApsMerchantRegister.findMerchant(client); + AlipayPlusRegisterResult alipayPlusRegisterResult = alipayApsMerchantRegister.findMerchant(client); return alipayPlusRegisterResult.getRawResponse(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java b/src/main/java/au/com/royalpay/payment/manage/merchants/deacriptor/ApsConfigDescriptor.java similarity index 71% rename from src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java rename to src/main/java/au/com/royalpay/payment/manage/merchants/deacriptor/ApsConfigDescriptor.java index 9274fc04c..cd63687e2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/deacriptor/ApsConfigDescriptor.java @@ -1,4 +1,4 @@ -package au.com.royalpay.payment.manage.merchants.core.descriptor; +package au.com.royalpay.payment.manage.merchants.deacriptor; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,5 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class ApsConfigDescriptor { - private Boolean enableAlipayAps = false; - private Boolean alipayCnSwitch = false; } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java index 5a945f842..aca1c3bf3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java @@ -1,8 +1,7 @@ package au.com.royalpay.payment.manage.merchants.entity; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; -import com.alibaba.fastjson.JSONObject; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -39,7 +38,6 @@ public class ApsConfigData implements Serializable { .setClientId(clientId) .setId(UUID.randomUUID().toString().replace("-", "")) .setAlipayCnSwitch(apsConfigDescriptor.getAlipayCnSwitch()) - .setEnableAlipayAps(apsConfigDescriptor.getEnableAlipayAps()) .setCreator(managerId) .setCreateTime(new Date()); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java index 5b64f54bc..a67e25f67 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.merchants.web; import au.com.royalpay.payment.manage.merchants.core.ApsConfigService; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.tools.CommonConsts; @@ -36,7 +36,7 @@ public class ApsConfigController { * @param apsConfigDescriptor * @return */ - @ManagerMapping(value = "/{clientId}", method = RequestMethod.POST, role = { ManagerRole.ADMIN,ManagerRole.OPERATOR,ManagerRole.SITE_MANAGER }) + @ManagerMapping(value = "/{clientId}", method = RequestMethod.POST, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.SITE_MANAGER}) public ApsConfigData saveApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable("clientId") String clientId, @RequestBody ApsConfigDescriptor apsConfigDescriptor) { return apsConfigService.saveApsConfigClientId(manager.getString("managerId"), clientId, apsConfigDescriptor); } @@ -48,8 +48,8 @@ public class ApsConfigController { * @param apsConfig * @return */ - @ManagerMapping(value = "/{clientId}", method = RequestMethod.PUT, role = { ManagerRole.ADMIN,ManagerRole.OPERATOR,ManagerRole.SITE_MANAGER }) - public ApsConfigData updateApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@PathVariable("clientId") String clientId, @RequestBody JSONObject apsConfig) { - return apsConfigService.updateApsConfigClientId(manager.getString("managerId"),clientId, apsConfig); + @ManagerMapping(value = "/{clientId}", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.SITE_MANAGER}) + public ApsConfigData updateApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable("clientId") String clientId, @RequestBody JSONObject apsConfig) { + return apsConfigService.updateApsConfigClientId(manager.getString("managerId"), clientId, apsConfig); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java index 6664a2dda..17c02586c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java @@ -57,6 +57,11 @@ public class OrgInfo { private Double min_rpaypmt_dd_rate; private String state; private String senior_parent_org_id; + private Double interchange_fee_value; + private Double min_interchange_fee_value; + private Double service_fee_value; + private Double min_service_fee_value; + public JSONObject toJsonParam() { @@ -417,4 +422,31 @@ public class OrgInfo { this.min_rpaypmt_overseas_card_rate = min_rpaypmt_overseas_card_rate; } + public Double getInterchange_fee_value(){ return interchange_fee_value; } + + public void setInterchange_fee_value(Double interchange_fee_value){ this.interchange_fee_value = interchange_fee_value; } + + public Double getMin_interchange_fee_value() { + return min_interchange_fee_value; + } + + public void setMin_interchange_fee_value(Double min_interchange_fee_value) { + this.min_interchange_fee_value = min_interchange_fee_value; + } + + public Double getService_fee_value() { + return service_fee_value; + } + + public void setService_fee_value(Double service_fee_value) { + this.service_fee_value = service_fee_value; + } + + public Double getMin_service_fee_value() { + return min_service_fee_value; + } + + public void setMin_service_fee_value(Double min_service_fee_value) { + this.min_service_fee_value = min_service_fee_value; + } } diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html index 269bd4953..ffffa5ad3 100644 --- a/src/main/ui/static/config/organizations/templates/org_detail.html +++ b/src/main/ui/static/config/organizations/templates/org_detail.html @@ -1,951 +1,1077 @@
-

-
    -
  1. Framework
    2. -
  2. - Organizations -
    3. -
  3. -
+

+
    +
  1. Framework
    2. +
  2. + Organizations +
    3. +
  3. +
-
-
- - -
-
-
- -
- -
-
-
- -
-

- - - -

-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
- - % -
-
-
-
-
-
- -
- - % -
-
-
-
-
- -
- - % -
-
+
+
+ + + +
+
+ +
+ +
+
+
+ +
+

+ + + +

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ + % +
+
+
+
+
+
+ +
+ + % +
+
+
+
+
+ +
+ + % +
+
-
- -
- - % -
-
+
+ +
+ + % +
+
-
- -
- - % -
-
+ +
+ +
+
+ +
+ + % +
+
+
+ +
+ + % +
+
+
+ +
+ + % +
+
-
- -
- - % -
-
+
+ +
+ + % +
+
+ -
- -
- - % -
-
-
- -
- - % -
-
- - - -
- -
- - % -
-
- - -
- -
- - % -
-
+
+
+ +
+ + % +
+
+ -
- -
- - % -
-
-
+ +
+ +
+ + % +
+
-
-
- -
- - % -
-
-
- -
- - % -
-
+ +
+ +
+ + % +
+
-
- -
- - % -
-
+
+ +
+ + % +
+
+
-
- -
- - % -
-
+
+
+ +
+ + % +
+
+
+ +
+ + % +
+
-
- -
- - % -
-
-
- -
- - % -
-
- +
+ - -
- -
- - % -
-
+ +
+ +
+ + % +
+
- -
- -
- - % -
-
+ +
+ +
+ + % +
+
-
- -
- - % -
-
-
-
+
+ +
+ + % +
+
+
+
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - Back -
- - -
-
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
UsernameDisplay NameWechatCreate TimeEmailRolesOperation
- {{manager.nickname}} - - - - - - - - - - - - - Modify - | - Disable -
-
-
-
-
Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}
+
+
+
交易额趋势
+
+
+
+
+
-
-
-
-
-
- - -
-
- -
-

- {{org.gateway_short_id||'初始化'}} - -

-
-
-
- -
- View -
-
-
- -
- Upload -
-
-
- - -
-
- -
- -
-
-
- - -
-
-
- 禁用 -   超期提醒   -   等待合规   -   绿色通道   -   通过   -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Partner CodePartner NameSub Mch IDRegister TimeCompliance StatusOrganizationBDOperation
- - - - (已禁用) - - - - - 通过({{partner.approve_time}}) - 资料完善中 - (自助开通)资料完善中 - 自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}}) - 不通过({{partner.approve_time}}) - 申请打回({{partner.refuse_remark|limitTo:15}}) - 等待合规 - 自助开通（等待合规） - 合同制作完成 - 等待BD上传材料审核 - 绿色通道申请中 - 等待合规 - - - Detail - -
-
-
- -
-
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
-
-
-
- - -
-
-
-
商户新增趋势
-
-
-
-
-
-
-
-
-
-
交易额趋势
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- ~ -
- -
+
+
+
+
+
+
+ +
+
+
+ +
+ ~ +
+ +
-
- Today -
-
- Yesterday -
-
- Last 7 Days -
-
- This Month -
-
- Last Month -
-
- This Year -
- +
+ Today +
+
+ Yesterday +
+
+ Last 7 Days +
+
+ This Month +
+
+ Last Month +
+
+ This Year +
+ +
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- -
交易分布
-
-
-
-

组织总交易额

-
- - - - - - - - - - - - - -
OrganizationAmount ($)
- -
+
+
+
+ +
交易分布
+
+
+
+

组织总交易额

+
+ + + + + + + + + + + + + +
OrganizationAmount ($)
+ +
+
+
+

{{chooseOrg}} 合伙人商户交易量排名

+
+ + + + + + + + + + + + + + + + + + + + + +
RankingPartnerAUD AmountRankingPartnerAmount
+ + {{sale[0].client_moniker}} + + + + {{sale[1].client_moniker}} + +
+ +
+
+
+
+
+
+
-
-

{{chooseOrg}} 合伙人商户交易量排名

-
- - - - - - - - - - - - - - - - - - - - - -
RankingPartnerAUD AmountRankingPartnerAmount
- - {{sale[0].client_moniker}} - - - - {{sale[1].client_moniker}} - -
- -
+ + +
+
合伙人提成
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
名称时间交易金额商户总手续费Royalpay手续费合伙人提成提成分润支付渠道
{{clientExtracts.year | limitTo:10}} - {{clientExtracts.month | limitTo:10}} + + + + + {{clientExtracts.channel}} +
+
+
+ +
+
Total Records:{{paginationc.totalCount}};Total + Pages:{{paginationc.totalPages}} +
+
+
-
-
-
-
-
-
- - -
-
合伙人提成
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
名称时间交易金额商户总手续费Royalpay手续费合伙人提成提成分润支付渠道
{{clientExtracts.year|limitTo:10}} - {{clientExtracts.month|limitTo:10}} - - - - {{clientExtracts.channel}} -
-
-
- -
-
Total Records:{{paginationc.totalCount}};Total Pages:{{paginationc.totalPages}}
-
-
-
- - -
-
- -
- -

-
-
-
- - - - + + +
+
+ +
+ +

+
+
+
+ + + + +
-
diff --git a/src/main/ui/static/config/organizations/templates/org_detail_parent.html b/src/main/ui/static/config/organizations/templates/org_detail_parent.html index 2da1eb371..f56b0ca33 100644 --- a/src/main/ui/static/config/organizations/templates/org_detail_parent.html +++ b/src/main/ui/static/config/organizations/templates/org_detail_parent.html @@ -121,6 +121,40 @@ + +
+ +
+
+ +
+ + % +
+
+
+ +
+ + % +
+
+
+ +
+ + % +
+
+
+ +
+ + % +
+
+ +
diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index 7ffca8d19..674177b2b 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -8,7 +8,7 @@

Bank Account + ng-if="!bankCtrl.edit && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))">

@@ -17,16 +17,16 @@
-

{{surcharge.balance|currency:'AUD'}}

+

{{surcharge.balance | currency:'AUD'}}

+ switch-change="allowSurchargeCredit(partner.allow_surcharge_credit)">
@@ -35,11 +35,11 @@

balance + ng-click="switchSurchargeMode()"> distributed + ng-click="switchSurchargeMode()">

启用到收支分离(distributed)模式，将使消费者支付手续费模式失效
@@ -52,41 +52,41 @@

+ switch-change="taxInSurcharge(partner.tax_in_surcharge)">
+ switch-change="customerTaxFree(partner.customer_tax_free)">
+ switch-change="skipClearing(partner.skip_clearing)">
+ switch-change="switchPreSettle(partner.enable_presettle)">

- AU${{partner.min_settle||'Not Configure'}} + AU${{partner.min_settle || 'Not Configure'}}

AU$
+ min="0">
+ ng-if="$root.complianceCheck.bankAccount"> + required ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
Bank
+ ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + required ng-readonly="!bankCtrl.edit">
+ ng-if="$root.complianceCheck.bankAccount"> + id="account_name_input" required ng-readonly="!bankCtrl.edit">
@@ -237,9 +237,9 @@

Rates - + ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))" + ng-click="newRate()"> +

@@ -247,16 +247,16 @@
@@ -364,58 +364,59 @@

AlipayPlus Rates - + ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4||(partner.approve_result==4&&partner.open_status==3)) && ('111'|withRole)))" + ng-click="newAlipayPlusRate()"> +

  • AlipayCN + ng-click="changeAlipayPlusRateState(true)" + ng-if="sysconfig.active_channels.indexOf('AlipayPlus')!=-1">AlipayCN
  • Other Wallets + ng-click="changeAlipayPlusRateState(false)">Other + Wallets
- - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - + +
Rate NameRate ValueTransaction FeeActive TimeExpire TimeClean DaysUpdate TimeOperatorRemarkOperation
Rate NameRate ValueTransaction FeeActive TimeExpire TimeClean DaysUpdate TimeOperatorRemarkOperation
T+{{rate.clean_days}} - - + T+{{rate.clean_days}} + + (Promotional Offer) + ng-href="/sys/partners/{{partner.client_moniker}}/export/aggregate/card_promotion_agree_pdf?rateid={{rate.client_rate_id}}"> -