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

upd:修改卡合同文件

Browse Source
master
dulingling 4 years ago
parent d22c2c4823
commit 8f00fed41f
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>2.3.58</version>
<version>2.3.59</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

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

@ -336,7 +336,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
//卡支付合同文件
private static final String LETTER_OF_OFFER_FILE = "letter_of_offer_file";
private static final String PROMOTIONAL_OFFER_FILE = "promotional_offer_file";
private static final String TERMS_AND_CONDITIONS_FILE = "terms_and_conditions_file";
// private static final String TERMS_AND_CONDITIONS_FILE = "terms_and_conditions_file";
private static final List<String> tags = new ArrayList<>();
@ -2948,7 +2948,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
throw new InvalidShortIdException();
}
exportLetterOfferPDF(clientMoniker, manager);
exportTermsConditionsPDF(clientMoniker, manager);
// exportTermsConditionsPDF(clientMoniker, manager);
if (!renewal) {
JSONObject cardFlow = sysClientUpayProfileMapper.findInfo(client.getInteger("client_id"));
@ -3182,8 +3182,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
throw new InvalidShortIdException();
}
List<JSONObject> existLeffterFiles = clientFilesMapper.findFileByClientAndType(client.getIntValue("client_id"), LETTER_OF_OFFER_FILE);
List<JSONObject> existConditionsFiles = clientFilesMapper.findFileByClientAndType(client.getIntValue("client_id"), TERMS_AND_CONDITIONS_FILE);
if (CollectionUtils.isEmpty(existLeffterFiles) && CollectionUtils.isEmpty(existConditionsFiles)) {
// List<JSONObject> existConditionsFiles = clientFilesMapper.findFileByClientAndType(client.getIntValue("client_id"), TERMS_AND_CONDITIONS_FILE);
if (CollectionUtils.isEmpty(existLeffterFiles)) {
throw new BadRequestException("The Agree File is not Complete!");
}
JSONObject cardFlowInfo = sysClientUpayProfileMapper.findInfo(client.getInteger("client_id"));
@ -6971,7 +6971,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
private void exportLetterOfferPDF(String clientMoniker, JSONObject manage) {
JSONObject info = convertClientLetterOfferInfo(clientMoniker);
String pdfPath = this.getClass().getClassLoader().getResource("").getPath() + "/templates/pdf/letter_of_offer.pdf";
String fileName = clientMoniker + "_Letter_of_Offer.pdf";
String fileName = clientMoniker + "Upay Letter Of Variation (business day, amendment).pdf";
publishExcelCardPDFFile(clientMoniker, manage, fileName, pdfPath, info, LETTER_OF_OFFER_FILE);
}
@ -7077,7 +7077,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
return info;
}
private void exportTermsConditionsPDF(String clientMoniker, JSONObject manage) {
/*private void exportTermsConditionsPDF(String clientMoniker, JSONObject manage) {
JSONObject client = getClientInfoByMoniker(clientMoniker);
if (client == null) {
throw new InvalidShortIdException();
@ -7088,7 +7088,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
String pdfPath = this.getClass().getClassLoader().getResource("").getPath() + "/templates/pdf/terms_and_conditions.pdf";
String fileName = clientMoniker + "_Terms_And_Conditions.pdf";
publishExcelCardPDFFile(clientMoniker, manage, fileName, pdfPath, new JSONObject(), TERMS_AND_CONDITIONS_FILE);
}
}*/
private void publishExcelCardPDFFile(String clientMoniker, JSONObject manager, String fileName, String pdfPath, JSONObject info, String fileLabel) {
try {

BIN
src/main/resources/templates/letter_of_offer.pdf
View File

Binary file not shown.

BIN
src/main/resources/templates/pdf/letter_of_offer.pdf
View File

Binary file not shown.

1
src/main/ui/rdjRRcCkVr.txt
Unescape View File

@ -0,0 +1 @@
89e1f60e5d01470f00ae272d8af6b446

10
src/main/ui/static/payment/partner/templates/partner_detail.html
Unescape View File

@ -284,9 +284,9 @@
<a ng-if="letterOfOfferFileManager.letter_of_offer_file" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Letter Of Offer合同</a>
<a ng-if="termsAndConditionsFile.terms_and_conditions_file" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Terms And Conditions合同</a>
<!-- <a ng-if="termsAndConditionsFile.terms_and_conditions_file" role="button" class="btn-group btn btn-warning"-->
<!-- type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i-->
<!-- class="fa fa-download"></i>下载Terms And Conditions合同</a>-->
<span style="margin-top: 5px" ng-if="partner.upay_open_status != 5">
<a ng-if="partner.upay_open_status==2" role="button" type="button" class="btn btn-primary"
ng-click="cardNotifyBD()">
@ -349,10 +349,10 @@
class="btn-group btn btn-warning"
type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Letter Of Offer合同</a>
<a ng-if="termsAndConditionsFile.terms_and_conditions_file && partner.upay_approve_result!=1" role="button"
<!--<a ng-if="termsAndConditionsFile.terms_and_conditions_file && partner.upay_approve_result!=1" role="button"
class="btn-group btn btn-warning"
type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Terms And Conditions合同</a>
class="fa fa-download"></i>下载Terms And Conditions合同</a>-->
<div ng-if="partner.upay_open_status==3" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-danger" ng-click="commitToCardCompliance()">Commit to Compliance
</button>

Write Preview
Loading…
Cancel
Save