diff --git a/src/db/modify.sql b/src/db/modify.sql index d3997663a..1a26ebc08 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -147,7 +147,6 @@ ALTER TABLE sys_org ADD COLUMN min_jd_rate DECIMAL(3,2) DEFAULT NULL COMMENT ' ALTER TABLE sys_org ADD COLUMN commission_type SMALLINT(1) DEFAULT '1' COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例'; - --agent_commission CREATE TABLE `financial_agent_commission` ( @@ -185,6 +184,9 @@ CREATE TABLE `financial_agent_commission_detail` ( alter table financial_partner_commission add column commission_type smallint(1) DEFAULT 1 COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例'; alter table financial_partner_commission_detail add column commission_type smallint(1) DEFAULT 1 COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例'; + + + INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`) diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java index 6a67c86f1..f1947df3b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java @@ -72,11 +72,11 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { item.put("month", mon); item.put("monthstr", year + "-" + StringUtils.substring("00" + mon, -2)); JSONObject chargeInfo = getCityPartnerPrizeInfo(item.getString("monthstr")); - item.put("total_charge", chargeInfo.getString("total_charge")); item.put("royalpay_charge", chargeInfo.getString("royalpay_charge")); item.put("org_charge", chargeInfo.getString("org_charge")); JSONObject referrerChargeInfo = getReferrerPrizeInfo(item.getString("monthstr")); item.put("referrer_charge",referrerChargeInfo.getString("org_charge")); + item.put("total_charge", chargeInfo.getBigDecimal("org_charge").add(referrerChargeInfo.getBigDecimal("org_charge"))); monthObjs.add(item); } return monthObjs; diff --git a/src/main/ui/static/analysis/org/templates/analysis_org.html b/src/main/ui/static/analysis/org/templates/analysis_org.html index 2ed8a96dc..13cefc4d8 100644 --- a/src/main/ui/static/analysis/org/templates/analysis_org.html +++ b/src/main/ui/static/analysis/org/templates/analysis_org.html @@ -8,7 +8,6 @@
  • 合伙人提成|City Partner Commissions
  • - diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html index 459a6d1f1..3161bffad 100644 --- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html +++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html @@ -29,10 +29,10 @@
    - +
    City Partner Charge: