msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upd:信用卡合规流程

Browse Source
master
dulingling 5 years ago
parent de5f731309
commit 5fcebd1235
6 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
Unescape View File

@ -393,7 +393,7 @@ public interface ClientManager {
void getAggregateCardAgreeFile(String clientMoniker, JSONObject manager, boolean renewal) throws Exception;
void getAggregateCardPromotionaAgreeFile(String clientMoniker, JSONObject manager, boolean renewal,Date promotionalEffectiveDate,int promotionalPeriod) throws Exception;
void getAggregateCardPromotionaAgreeFile(String clientMoniker, JSONObject manager, boolean renewal,String promotionalEffectiveDate,int promotionalPeriod) throws Exception;
void getNewAggregateAgreeFile(String clientMoniker, JSONObject manager, boolean renewal) throws Exception;

8
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -142,6 +142,7 @@ import java.security.InvalidParameterException;
import java.security.KeyPair;
import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.*;
@ -3194,7 +3195,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}
@Override
@Transactional
public void getAggregateCardPromotionaAgreeFile(String clientMoniker, JSONObject manager, boolean renewal,Date promotionalEffectiveDate,int promotionalPeriod){
public void getAggregateCardPromotionaAgreeFile(String clientMoniker, JSONObject manager, boolean renewal,String promotionalEffectiveDate,int promotionalPeriod) throws ParseException {
JSONObject client = clientMapper.findClientByMoniker(clientMoniker);
if (client == null) {
throw new InvalidShortIdException();
@ -7386,8 +7387,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
return info;
}
private void exportPromotionalOfferPDF(String clientMoniker,JSONObject manager,Date promotionalEffectiveDate,int promotionalPeriod) {
JSONObject info = convertPromotionalOfferInfo(clientMoniker,convertDateEnglish(promotionalEffectiveDate),promotionalPeriod);
private void exportPromotionalOfferPDF(String clientMoniker,JSONObject manager,String promotionalEffectiveDate,int promotionalPeriod) throws ParseException {
Date date = DateUtils.parseDate(promotionalEffectiveDate,"yyyy-MM-dd");
JSONObject info = convertPromotionalOfferInfo(clientMoniker,convertDateEnglish(date),promotionalPeriod);
String pdfPath = this.getClass().getClassLoader().getResource("").getPath() + "/templates/pdf/promotional_offer.pdf";
String fileName = clientMoniker + "_Promotional_Offer.pdf";
publishExcelCardPDFFile(clientMoniker,manager,fileName, pdfPath, info,PROMOTIONAL_OFFER_FILE);

2
src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
Unescape View File

@ -704,7 +704,7 @@ public class PartnerManageController {
*/
@ManagerMapping(value = "/{clientMoniker}/export/aggregate/card_promotiona_agree_pdf", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.DIRECTOR, ManagerRole.OPERATOR})
public void exportAggregateCardPromotionaAgreeFile(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,
@RequestParam("date") Date promotionalEffectiveDate,@RequestParam("period") int promotionalPeriod) throws Exception {
@RequestParam("date") String promotionalEffectiveDate,@RequestParam("period") int promotionalPeriod) throws Exception {
clientManager.getAggregateCardPromotionaAgreeFile(clientMoniker, manager, false,promotionalEffectiveDate,promotionalPeriod);
}

2
src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
Unescape View File

@ -180,7 +180,7 @@
<select id="latestCardChannelCleanDays" resultType="com.alibaba.fastjson.JSONObject">
SELECT cr.*,c.clean_days c_clean_days FROM sys_client_rates cr
INNER JOIN sys_clients c on c.client_id= cr.client_id and c.is_valid = 1
INNER JOIN sys_clients_card_flow cf ON cf.client_id = c.client_id AND ( cf.approve_result = 4 AND cf.open_status NOT IN (0,5) )
INNER JOIN sys_clients_card_flow cf ON cf.client_id = c.client_id AND ( cf.approve_result 4 AND cf.open_status NOT IN (0,5) )
where cr.client_id = #{client_id}
and cr.rate_name = #{rate_name}
order by cr.expiry_time desc

19
src/main/ui/static/commons/templates/promotiona_commit.html
Unescape View File

@ -0,0 +1,19 @@
<div class="modal-header bg-green">
<h4 style="text-align: center">制作PPromotional Offer合同</h4>
</div>
<div class="modal-body" style="padding: 30px">
<div class="row">
<div class="col-xs-12">
<lable>请选择优惠生效日:</lable>
<input placeholder="From" uib-datepicker-popup is-open="ctrl.from" ng-click="ctrl.from=true" id="promotiona_date" ng-model="" datepicker-options="{maxDate:filter.to}">
</div>
<div class="col-xs-12">
<lable>请输入活动周期:</lable>
<input id="promotiona_period" ng-model="">
</div>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-success" type="button" ng-click="readNotice()" ng-if="!previewStatus && notice.status=='0'">I Know</button>
<button class="btn btn-danger" type="button" ng-click="$dismiss()">Close</button>
</div>

26
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -424,6 +424,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.isComplianceOfCompanyName = false;
$scope.isComplianceOfShortName = false;
$scope.isComplianceOfBusinessStructure = false;
$scope.cardPromotionaparams={}
var website = partner.data.company_website;
if (website != null) {
if (website.indexOf('http') != 0) {
@ -685,12 +686,15 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
//制作促销合同
$scope.exportCardPromotionaAgreegatePDF = function(){
var title = 'Warning';
$scope.cardPromotionaparams={}
var contentHtml = $sce.trustAsHtml('<lable>请选择优惠生效日:</lable>'+ ' <input placeholder="From" uib-datepicker-popup\n' +
' is-open="ctrl.from" ng-click="ctrl.from=true" ng-model="cardPromotionaparams.date"\n' +
' datepicker-options="{maxDate:filter.to}"><div style="margin-bottom: 2px"></div>' +
' <lable>请输入活动周期:</lable> <input ng-model="cardPromotionaparams.period">');
var title = '确认生成Promotional Offer合同';
var promotiona_date='';
var promotiona_period ='';
var contentHtml = $sce.trustAsHtml(
'<lable>请输入优惠生成日:</lable> '+
'<input id="promotiona_date" ng-bind="promotiona_date"> (eg: 2020-02-01)' +
'<div style="margin-bottom: 5px"></div>' +
'<lable>请输入活动周期数:</lable> ' +
'<input id="promotiona_period" ng-bind="promotiona_period"> (unit:week)');
var choises = [{label: '取消', className: 'btn-danger', key: '2', dismiss: true},
{label: '确认提交', className: 'btn-success', key: '1'}];
var content = '';
@ -701,8 +705,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
choises: choises,
contentHtml: contentHtml
}).then(function (res) {
if(params != null){
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/aggregate/card_promotiona_agree_pdf').then(function () {
var date = document.getElementById("promotiona_date").value;
var period = document.getElementById("promotiona_period").value;
if(date=='' || period==''){
commonDialog.alert({title: 'Error', content: '选项不得未空', type: 'error'});
}else{
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/aggregate/card_promotiona_agree_pdf?date='+date+'&period='+period).then(function () {
commonDialog.alert({
title: 'Success',
content: 'Agreement File Generate Succeed! Please notify BD!',
@ -716,8 +724,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
});
}
});
});
}
$scope.Export = function () {

Write Preview
Loading…
Cancel
Save