Merge branch 'update1' into develop

# Conflicts:
#	src/db/modify.sql
#	src/main/ui/static/analysis/org/templates/analysis_org.html
master
wangning 7 years ago
commit 6512c4d249

@ -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:收益比例'; ALTER TABLE sys_org ADD COLUMN commission_type SMALLINT(1) DEFAULT '1' COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例';
--agent_commission --agent_commission
CREATE TABLE `financial_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 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:收益比例'; 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`) INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`)

@ -72,11 +72,11 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
item.put("month", mon); item.put("month", mon);
item.put("monthstr", year + "-" + StringUtils.substring("00" + mon, -2)); item.put("monthstr", year + "-" + StringUtils.substring("00" + mon, -2));
JSONObject chargeInfo = getCityPartnerPrizeInfo(item.getString("monthstr")); JSONObject chargeInfo = getCityPartnerPrizeInfo(item.getString("monthstr"));
item.put("total_charge", chargeInfo.getString("total_charge"));
item.put("royalpay_charge", chargeInfo.getString("royalpay_charge")); item.put("royalpay_charge", chargeInfo.getString("royalpay_charge"));
item.put("org_charge", chargeInfo.getString("org_charge")); item.put("org_charge", chargeInfo.getString("org_charge"));
JSONObject referrerChargeInfo = getReferrerPrizeInfo(item.getString("monthstr")); JSONObject referrerChargeInfo = getReferrerPrizeInfo(item.getString("monthstr"));
item.put("referrer_charge",referrerChargeInfo.getString("org_charge")); item.put("referrer_charge",referrerChargeInfo.getString("org_charge"));
item.put("total_charge", chargeInfo.getBigDecimal("org_charge").add(referrerChargeInfo.getBigDecimal("org_charge")));
monthObjs.add(item); monthObjs.add(item);
} }
return monthObjs; return monthObjs;

@ -8,7 +8,6 @@
<li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)"> <li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)">
<a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a> <a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>

@ -29,10 +29,10 @@
<div class="info-box-content"> <div class="info-box-content">
<!--<div class="info-box-text text-bold text-red" ng-bind="r.charge_date"></div>--> <!--<div class="info-box-text text-bold text-red" ng-bind="r.charge_date"></div>-->
<div> <div>
<!-- <div class="info-box-number-right"> <div class="info-box-number-right">
<span class="text-bold">Total Charge:</span> <span class="text-bold">Total Charge:</span>
<span class="text-green" ng-bind="mon.total_charge|currency:'AUD'"></span> <span class="text-green" ng-bind="mon.total_charge|currency:'AUD'"></span>
</div>--> </div>
<div class="info-box-number-right"> <div class="info-box-number-right">
<span class="text-bold">City Partner Charge:</span> <span class="text-bold">City Partner Charge:</span>
<span class="text-green" ng-bind="mon.org_charge|currency:'AUD'"></span> <span class="text-green" ng-bind="mon.org_charge|currency:'AUD'"></span>

Loading…
Cancel
Save