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 3bf572411..802394d1c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -392,6 +392,11 @@ public class MemberService { public void createMemberInvoiceTitle(CreateInvoiceTitleDTO dto) { MemberInvoiceTitle title = new MemberInvoiceTitle(); BeanUtils.copyProperties(dto, title); + if (StringUtils.isEmail(dto.getReception())) { + title.setEmail(dto.getReception()); + } else { + title.setPhoneNumber(dto.getReception()); + } int i = memberInvoiceTitleService.insertMemberInvoiceTitle(title); log.info("新增{}条发票抬头", i); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberInvoiceTitle.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberInvoiceTitle.java index 4071381dd..5558797cc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberInvoiceTitle.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberInvoiceTitle.java @@ -57,6 +57,8 @@ public class MemberInvoiceTitle extends BaseEntity { @Excel(name = "电话号码") private String phoneNumber; + private String email; + /** * 开户银行 */ @@ -76,86 +78,6 @@ public class MemberInvoiceTitle extends BaseEntity { */ private String delFlag; - public void setId(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public void setMemberId(String memberId) { - this.memberId = memberId; - } - - public String getMemberId() { - return memberId; - } - - public void setTitleType(String titleType) { - this.titleType = titleType; - } - - public String getTitleType() { - return titleType; - } - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setTaxId(String taxId) { - this.taxId = taxId; - } - - public String getTaxId() { - return taxId; - } - - public void setUnitAddress(String unitAddress) { - this.unitAddress = unitAddress; - } - - public String getUnitAddress() { - return unitAddress; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setBankName(String bankName) { - this.bankName = bankName; - } - - public String getBankName() { - return bankName; - } - - public void setBankAccountNumber(String bankAccountNumber) { - this.bankAccountNumber = bankAccountNumber; - } - - public String getBankAccountNumber() { - return bankAccountNumber; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public String getDelFlag() { - return delFlag; - } - @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateInvoiceTitleDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateInvoiceTitleDTO.java index 73c33adcb..a6017d684 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateInvoiceTitleDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateInvoiceTitleDTO.java @@ -54,4 +54,9 @@ public class CreateInvoiceTitleDTO { * 默认标识(0-否;1-是) */ private String defaultFlag; + + /** + * 接收方式 + */ + private String reception; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml index 36b867dc0..97996c4b7 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml @@ -11,6 +11,7 @@ + @@ -23,7 +24,7 @@ - id, member_id, title_type, name, tax_id, unit_address, phone_number, bank_name, bank_account_number, + id, member_id, title_type, name, tax_id, unit_address, email, phone_number, bank_name, bank_account_number, default_flag, create_time, create_by, update_time, update_by, del_flag @@ -60,6 +61,7 @@ name, tax_id, unit_address, + email, phone_number, bank_name, bank_account_number, @@ -76,6 +78,7 @@ #{name}, #{taxId}, #{unitAddress}, + #{email}, #{phoneNumber}, #{bankName}, #{bankAccountNumber}, @@ -96,6 +99,7 @@ name = #{name}, tax_id = #{taxId}, unit_address = #{unitAddress}, + email = #{email}, phone_number = #{phoneNumber}, bank_name = #{bankName}, bank_account_number = #{bankAccountNumber},