From dbfe41e50690f7e3cd87a6b0188a827020753b04 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 24 May 2023 11:58:31 +0800 Subject: [PATCH] update --- .../src/main/java/com/jsowell/service/MemberService.java | 5 +++++ .../java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 05512ee75..d5bba3173 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -372,6 +372,9 @@ public class MemberService { return resultList; } for (MemberInvoiceTitle memberInvoiceTitle : memberInvoiceTitles) { + String reception = StringUtils.isNotEmpty(memberInvoiceTitle.getEmail()) + ? memberInvoiceTitle.getEmail() + : memberInvoiceTitle.getPhoneNumber(); resultList.add( InvoiceTitleVO.builder() .titleId(memberInvoiceTitle.getId() + "") @@ -380,6 +383,8 @@ public class MemberService { .taxId(memberInvoiceTitle.getTaxId()) .unitAddress(memberInvoiceTitle.getUnitAddress()) .phoneNumber(memberInvoiceTitle.getPhoneNumber()) + .email(memberInvoiceTitle.getEmail()) + .reception(reception) .bankName(memberInvoiceTitle.getBankName()) .bankAccountNumber(memberInvoiceTitle.getBankAccountNumber()) .defaultFlag(memberInvoiceTitle.getDefaultFlag()) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java index 4318aa345..4213a376b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java @@ -29,8 +29,16 @@ public class InvoiceTitleVO { */ private String unitAddress; + /** + * 电子邮箱 + */ private String email; + /** + * 接收方式 + */ + private String reception; + /** * 电话号码 */