diff --git a/src/db/modify.sql b/src/db/modify.sql index b24bac50b..390efea1f 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -333,4 +333,7 @@ create_time datetime not null, operation varchar(50) DEFAULT NULL, PRIMARY key(`id`) ); -alter table act_app_list MODIFY column is_show_window tinyint(1) DEFAULT 0 COMMENT 'app是否弹框' \ No newline at end of file +alter table act_app_list MODIFY column is_show_window tinyint(1) DEFAULT 0 COMMENT 'app是否弹框' + + +alter table sys_clients_contract add column confirm_time datetime DEFAULT null comment '合同确认时间'; \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java index 043079965..17c9620d1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java @@ -1,5 +1,6 @@ package au.com.royalpay.payment.manage.mappers.system; +import java.sql.SQLType; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -23,4 +24,7 @@ public interface ClientsContractMapper { JSONObject findByClientId(@Param("client_id") int clientId); + @AutoSql(type = SqlType.SELECT) + List list(); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java index 9f57b23ea..902ef5e0f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java @@ -2,6 +2,8 @@ package au.com.royalpay.payment.manage.system.core; import com.alibaba.fastjson.JSONObject; +import java.util.List; + public interface ClientContractService { JSONObject getOrGenerateSourceAgreement(int client_id,String channel); @@ -12,4 +14,5 @@ public interface ClientContractService { JSONObject getClientContractExpire(int client_id); + List list(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java index 2827e912f..d85e0ecfe 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java @@ -107,14 +107,15 @@ public class ClientContractServiceImpl implements ClientContractService { if(contract.getBoolean("has_sign")){ return; } + Date now = new Date(); JSONObject account = clientAccountMapper.findById(account_id); contract.put("has_sign", 1); contract.put("sign_account_id",account_id); contract.put("sign_channel",channel); + contract.put("confirm_time",now); contract.put("signatory",account.getString("display_name")); clientsContractMapper.update(contract); - Date now = new Date(); List rateInfo = clientRateMapper.minExpiryTime(client_id, null); if(expire){ rateInfo.forEach((p)->{ @@ -214,4 +215,9 @@ public class ClientContractServiceImpl implements ClientContractService { return result; } + + @Override + public List list() { + return clientsContractMapper.list(); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java b/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java new file mode 100644 index 000000000..2d688dfe8 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java @@ -0,0 +1,26 @@ +package au.com.royalpay.payment.manage.system.web; + +import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; +import au.com.royalpay.payment.manage.system.core.ClientContractService; + +import com.alibaba.fastjson.JSONObject; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import javax.annotation.Resource; + +@RestController +@RequestMapping(value = "/manage/contract") +public class contractController { + @Resource + private ClientContractService clientContractService; + + @ManagerMapping(value = "/list",method = RequestMethod.GET) + public List list(){ + return clientContractService.list(); + } +} diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index e6057232c..74127442d 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -338,6 +338,12 @@ margin-bottom: 10%;"/> 余额增值活动 +
  • + + 合同签约情况 + +
    • +
  • 机构|Agent
  • @@ -417,7 +423,6 @@ margin-bottom: 10%;"/> 网站管理|Site Manage
    • -
  • 积分商城|Integral Mall diff --git a/src/main/ui/static/sys/contract.js b/src/main/ui/static/sys/contract.js new file mode 100644 index 000000000..2ce9fba49 --- /dev/null +++ b/src/main/ui/static/sys/contract.js @@ -0,0 +1,23 @@ +/** + * Created by yishuqian on 01/06/2017. + */ +define(['angular'], function (angular) { + 'use strict'; + var app = angular.module('contractApp', ['ui.router']); + app.config(['$stateProvider', function ($stateProvider) { + $stateProvider.state('contract', { + url: '/contract', + templateUrl: '/static/sys/templates/contract_sign.html', + controller: 'contractAnalysisCtrl' + }) + }]); + app.controller('contractAnalysisCtrl', ['$scope', '$http', '$state', '$filter', 'commonDialog', function ($scope, $http, $state, $filter, commonDialog) { + $scope.getContractAnalysis = function () { + $http.get('/manage/contract/list').then(function (resp) { + $scope.contract_analysis = resp.data; + }); + }; + $scope.getContractAnalysis(); + }]); + return app; +}); \ No newline at end of file diff --git a/src/main/ui/static/sys/templates/contract_sign.html b/src/main/ui/static/sys/templates/contract_sign.html new file mode 100644 index 000000000..ca4349457 --- /dev/null +++ b/src/main/ui/static/sys/templates/contract_sign.html @@ -0,0 +1,70 @@ +
    Contract
    +
    +
    +
    费率已过期商户({{warning.no_rate.length}}家)
    +
    + + + + + + + + + + + + + + + + + + + + + +
    Client MonikerShort NameChannelBDLatest RateExpire Date
    + +
    +
    +
    +
    +
    费率即将过期商户({{warning.rate_warning.length}}家)
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    Client MonikerShort NameChannelBDRateExpire DateOperation
    + + + +
    +
    +
    +
    +
    + +
    \ No newline at end of file