diff --git a/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/descriptor/LoanApplicationDescriptor.java b/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/descriptor/LoanApplicationDescriptor.java index 543ba9454..f1c072c6f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/descriptor/LoanApplicationDescriptor.java +++ b/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/descriptor/LoanApplicationDescriptor.java @@ -37,8 +37,18 @@ public class LoanApplicationDescriptor { */ private String status; + /** + * 处理状态值 + */ + private String statusDescription; + /** * 备注信息 */ private String remark; + + /** + * 申请来源 + */ + private Integer source; } diff --git a/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/entity/LoanApplication.java b/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/entity/LoanApplication.java index 4ad6d9099..b9117657f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/entity/LoanApplication.java +++ b/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/entity/LoanApplication.java @@ -60,6 +60,11 @@ public class LoanApplication { */ private String remark; + /** + * 申请来源 + */ + private Integer source; + public LoanApplicationDescriptor describe() { return new LoanApplicationDescriptor() .setId(this.id) @@ -70,7 +75,9 @@ public class LoanApplication { .setEmail(this.email) .setBusinessName(this.businessName) .setIndustry(this.industry) - .setStatus(this.status.description()) - .setRemark(this.remark); + .setStatus(this.status.value()) + .setStatusDescription(this.status.description()) + .setRemark(this.remark) + .setSource(this.source); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/officialwebsit/infrastructure/service/PartnerApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/officialwebsit/infrastructure/service/PartnerApplyServiceImpl.java index 62e0742e3..534129e57 100644 --- a/src/main/java/au/com/royalpay/payment/manage/officialwebsit/infrastructure/service/PartnerApplyServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/officialwebsit/infrastructure/service/PartnerApplyServiceImpl.java @@ -60,6 +60,7 @@ public class PartnerApplyServiceImpl implements PartnerApplyService, Application result.put("industry", apply.getIndustry()); result.put("business_name", apply.getBusinessName()); result.put("status", LoanApplicationStatus.READY.code()); + result.put("source", 0); return result; } @@ -71,6 +72,7 @@ public class PartnerApplyServiceImpl implements PartnerApplyService, Application result.put("contact_phone", apply.getPhoneNumber()); result.put("contact_email", apply.getEmailAddress()); result.put("company_name", apply.getBusinessName()); + result.put("short_name", apply.getBusinessName()); result.put("industry", apply.getIndustry()); result.put("type", 1); return result; diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/loanapplication/LoanApplicationMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/loanapplication/LoanApplicationMapper.xml index e01308a94..e00f94c5e 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/loanapplication/LoanApplicationMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/loanapplication/LoanApplicationMapper.xml @@ -16,12 +16,19 @@ + SELECT * FROM sys_clients_loans_apply scla + + + + and scla.business_name like #{business_name_pattern} + + ORDER BY scla.create_time DESC --> - PC + PC(卡支付) 公众号菜单 公众号推送 小程序申请 @@ -108,4 +108,4 @@ - \ No newline at end of file + diff --git a/src/main/ui/static/payment/partner/templates/partner_loans_application.html b/src/main/ui/static/payment/partner/templates/partner_loans_application.html new file mode 100644 index 000000000..6ca3238fc --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/partner_loans_application.html @@ -0,0 +1,90 @@ + + + + + + + + + Company Name + + + + + + + + + + + + Application List + + + + + + + + Application Time + Company Name + Source + Approve Status + Remark + Operation + + + + + + + + PC + 公众号菜单 + 公众号推送 + 小程序申请 + App申请 + + + {{partner.statusDescription}} + + + + + handle + + + + + + + + + + + + + + + + + diff --git a/src/main/ui/static/payment/partner/templates/partner_loans_application_edit.html b/src/main/ui/static/payment/partner/templates/partner_loans_application_edit.html new file mode 100644 index 000000000..8185fe753 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/partner_loans_application_edit.html @@ -0,0 +1,33 @@ + + + + + + Status + + + READY + PROCESSING + COMPLETED + + + + + Remark + + + + + + + + + + + + diff --git a/src/main/ui/static/payment/partner/templates/partners_apply.html b/src/main/ui/static/payment/partner/templates/partners_apply.html index e05375a16..49839bc6c 100644 --- a/src/main/ui/static/payment/partner/templates/partners_apply.html +++ b/src/main/ui/static/payment/partner/templates/partners_apply.html @@ -19,9 +19,9 @@ Application & Open - + + Loans Application +