diff --git a/src/db/modify.sql b/src/db/modify.sql index d3997663a..4220188b0 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -139,15 +139,16 @@ ALTER TABLE sys_clients_customers ADD COLUMN channel varchar(15) not NULL ; ALTER TABLE sys_clients_customers ADD COLUMN last_payment_time datetime DEFAULT NULL COMMENT '最后一次付款时间'; ALTER TABLE sys_org ADD COLUMN parent_org_id int(11) DEFAULT NULL; -ALTER TABLE sys_org ADD COLUMN min_wechat_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低微信费率'; -ALTER TABLE sys_org ADD COLUMN min_alipay_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低支付宝费率'; -ALTER TABLE sys_org ADD COLUMN min_alipayonline_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低支付宝线上费率'; -ALTER TABLE sys_org ADD COLUMN min_bestpay_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低翼支付费率'; -ALTER TABLE sys_org ADD COLUMN min_jd_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低京东费率'; +ALTER TABLE sys_org ADD COLUMN min_wechat_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低微信费率'; +ALTER TABLE sys_org ADD COLUMN min_alipay_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低支付宝费率'; +ALTER TABLE sys_org ADD COLUMN min_alipayonline_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低支付宝线上费率'; +ALTER TABLE sys_org ADD COLUMN min_bestpay_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低翼支付费率'; +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:收益比例'; +<<<<<<<<< Temporary merge branch 1 --agent_commission CREATE TABLE `financial_agent_commission` ( 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 e61d0a529..2ed8a96dc 100644 --- a/src/main/ui/static/analysis/org/templates/analysis_org.html +++ b/src/main/ui/static/analysis/org/templates/analysis_org.html @@ -6,10 +6,7 @@ 合伙人销售量|City Partner Sale
  • - 合伙人提成|City Partner Commissions -
    • -
  • - 推荐人提成|Referrer Commissions + 合伙人提成|City Partner Commissions
    • diff --git a/src/main/ui/static/config/orgcommission/orgcommission.js b/src/main/ui/static/config/orgcommission/orgcommission.js index 3171ff7a7..448e79b29 100644 --- a/src/main/ui/static/config/orgcommission/orgcommission.js +++ b/src/main/ui/static/config/orgcommission/orgcommission.js @@ -14,18 +14,20 @@ var commissionTypeMap = [{ "value": "收益比例" } ]; - - define(['angular','../../analysis/org/analysis-org'], function (angular) { 'use strict'; var app = angular.module('orgcommission', ['ui.router']); app.config(['$stateProvider', function ($stateProvider) { - $stateProvider.state('analysis_org.orgcommission', { + $stateProvider.state('analysis_org.commission', { url: '/org_commissions', templateUrl: '/static/config/orgcommission/templates/org_commission_root.html', controller: 'orgCommissionRootCtrl' - }).state('analysis_org.orgcommission.month', { - url: '/months/{monthStr}', + }).state('analysis_org.commission.month', { + url: '/commissionorg/months/{monthStr}', + templateUrl: '/static/config/orgcommission/templates/org_commission_month_root.html', + controller: 'commissionMonthRootCtrl' + }).state('analysis_org.commission.month.org', { + url: '/org', templateUrl: '/static/config/orgcommission/templates/org_commission_month.html', controller: 'orgCommissionMonthViewCtrl', resolve: { @@ -33,7 +35,16 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) { return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr); }] } - }).state('analysis_org.orgcommission.month.orgdetail', { + }).state('analysis_org.commission.month.referrer', { + url: '/referrer', + templateUrl: '/static/config/referrercommission/templates/referrer_commission_month.html', + controller: 'referrerCommissionMonthViewCtrl', + resolve: { + monthData: ['$http', '$stateParams', function ($http, $stateParams) { + return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr); + }] + } + }).state('analysis_org.commission.month.org.orgdetail', { url: '/citypartners/{orgId}', templateUrl: '/static/config/orgcommission/templates/org_commission_detail.html', controller: 'orgCommissionOrgDetailCtrl', @@ -42,13 +53,25 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) { return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId); }] } + }).state('analysis_org.commission.month.referrer.referrerdetail', { + url: '/referrer_commissions/{orgId}', + templateUrl: '/static/config/referrercommission/templates/referrer_commission_detail.html', + controller: 'referrerCommissionOrgDetailCtrl', + resolve: { + detail: ['$http', '$stateParams', function ($http, $stateParams) { + return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId); + }] + } }) }]); - + app.controller('commissionMonthRootCtrl', ['$scope', '$state', function ($scope, $state) { + if($state.is('analysis_org.commission.month')){ + $state.go('.org'); + } + }]); app.controller('orgCommissionRootCtrl', ['$scope', '$http', '$filter', '$state', 'commonDialog', function ($scope, $http, $filter, $state, commonDialog) { $scope.generate = {}; - $scope.generateOrgCommission = function () { $scope.generate.status = {}; if (!$scope.generate.month) { @@ -63,7 +86,7 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) { }).then(function () { var params = {month: $filter('date')($scope.generate.month, 'yyyy-MM')}; $http.post('/sys/citypartner_prizes/generate', params).then(function () { - $state.go('analysis_org.orgcommission.month', {monthStr: params.month}) + $state.go('.org.month', {monthStr: params.month}) $scope.generate.status = null; }, function (resp) { commonDialog.alert({type: 'error', title: 'Error', content: resp.data.message}); @@ -89,9 +112,14 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) { return has; }; $scope.gotoMonth = function (mon) { - var monthStr = $scope.params.year.getFullYear() + '-' + (('0' + mon).substr(-2)); - $state.go('analysis_org.orgcommission.month', {monthStr: monthStr}) + if(mon){ + $scope.params.month = mon; + } + var monthStr = $scope.params.year.getFullYear() + '-' + $scope.params.month; + $state.go('analysis_org.commission.month', {monthStr: monthStr}) }; + + }]); app.controller('orgCommissionMonthViewCtrl', ['$scope', 'monthData','$filter', function ($scope, monthData) { $scope.monthData = monthData.data; @@ -118,6 +146,29 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) { } }]); + app.controller('referrerCommissionMonthViewCtrl', ['$scope', 'monthData', function ($scope, monthData) { + $scope.monthData = monthData.data; + $scope.ctrl = {}; + $scope.active = function (log) { + if($scope.ctrl.activeLog && $scope.ctrl.activeLog.org_id==log.org_id){ + $scope.ctrl.activeLog=null; + return; + } + $scope.ctrl.activeLog=log; + } + }]); + + app.controller('referrerCommissionOrgDetailCtrl', ['$scope', 'detail', function ($scope, detail) { + $scope.detail = detail.data; + $scope.ctrl = {}; + $scope.active = function (log) { + if($scope.ctrl.activeLog && $scope.ctrl.activeLog.client_moniker==log.client_moniker){ + $scope.ctrl.activeLog=null; + return; + } + $scope.ctrl.activeLog=log; + } + }]); app.filter('commission_type_filter', function () { return function (sectorValue) { diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html new file mode 100644 index 000000000..26248c37f --- /dev/null +++ b/src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html @@ -0,0 +1,13 @@ +
    + +
    + +
    +
    \ No newline at end of file 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 27478cb97..b51901666 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 @@ -1,11 +1,4 @@ - - - - - - - -
    +
    @@ -13,7 +6,6 @@ -
    \ No newline at end of file + \ No newline at end of file diff --git a/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html b/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html index 1b4d4a8b6..986b21930 100644 --- a/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html +++ b/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html @@ -5,7 +5,6 @@ } -
    Analysis
    diff --git a/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html b/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html index b2c28ee8e..a405a1425 100644 --- a/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html +++ b/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html @@ -34,7 +34,7 @@ - +