diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 80a0cde34..55d685d14 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -115,6 +115,9 @@ public class OrderService { @Autowired private AdapayCallbackRecordService adapayCallbackRecordService; + @Autowired + private IMemberInvoiceTitleService memberInvoiceTitleService; + private List stationIdList = Lists.newArrayList("1", "2"); /** @@ -1169,6 +1172,24 @@ public class OrderService { totalServiceAmount = totalServiceAmount.add(orderVO.getTotalServiceAmount()); } + // 查抬头信息 + MemberInvoiceTitle invoiceTitle = memberInvoiceTitleService.selectMemberInvoiceTitleById(Long.parseLong(dto.getTitleId())); + if (StringUtils.isNotEmpty(dto.getReception())) { + boolean b = false; + if (StringUtils.isEmail(dto.getReception()) && !StringUtils.equals(dto.getReception(), invoiceTitle.getEmail())) { + invoiceTitle.setEmail(dto.getReception()); + b = true; + } + if (StringUtils.isPhoneNumber(dto.getReception()) && !StringUtils.equals(dto.getReception(), invoiceTitle.getPhoneNumber())) { + invoiceTitle.setPhoneNumber(dto.getReception()); + b = true; + } + if (b) { + memberInvoiceTitleService.updateMemberInvoiceTitle(invoiceTitle); + } + } + + // 入库 OrderInvoiceRecord orderInvoiceRecord = new OrderInvoiceRecord(); orderInvoiceRecord.setStatus("0"); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyOrderInvoiceDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyOrderInvoiceDTO.java index a9c701ab8..02234f024 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyOrderInvoiceDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/ApplyOrderInvoiceDTO.java @@ -20,4 +20,9 @@ public class ApplyOrderInvoiceDTO { // 抬头id private String titleId; + + /** + * 接收方式 + */ + private String reception; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java index cfc4b13a5..1decd561c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java @@ -26,7 +26,7 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService @Override public InvoiceTitleVO selectByTitleId(String titleId) { - MemberInvoiceTitle memberInvoiceTitle = memberInvoiceTitleMapper.selectMemberInvoiceTitleById(Long.parseLong(titleId)); + MemberInvoiceTitle memberInvoiceTitle = selectMemberInvoiceTitleById(Long.parseLong(titleId)); if (memberInvoiceTitle == null) { return null; } @@ -36,6 +36,7 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService .titleType(TitleTypeEnum.getLabel(memberInvoiceTitle.getTitleType())) .taxId(memberInvoiceTitle.getTaxId()) .unitAddress(memberInvoiceTitle.getUnitAddress()) + .email(memberInvoiceTitle.getEmail()) .phoneNumber(memberInvoiceTitle.getPhoneNumber()) .bankName(memberInvoiceTitle.getBankName()) .bankAccountNumber(memberInvoiceTitle.getBankAccountNumber()) @@ -101,7 +102,6 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService */ @Override public int updateMemberInvoiceTitle(MemberInvoiceTitle memberInvoiceTitle) { - // memberInvoiceTitle.setUpdateTime(DateUtils.getNowDate()); if (StringUtils.equals(memberInvoiceTitle.getDefaultFlag(), "1")) { // 如果新增这条是默认的,那么就把这个会员下所有的其他抬头的默认取消 List memberInvoiceTitles = selectMemberInvoiceTitleList(memberInvoiceTitle.getMemberId()); 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 fb4de33b8..4318aa345 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,6 +29,8 @@ public class InvoiceTitleVO { */ private String unitAddress; + private String email; + /** * 电话号码 */