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 751e62ad1..825caae22 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -364,6 +364,11 @@ public class MemberService { .titleId(memberInvoiceTitle.getId() + "") .titleName(memberInvoiceTitle.getName()) .titleType(TitleTypeEnum.getLabel(memberInvoiceTitle.getTitleType())) + .taxId(memberInvoiceTitle.getTaxId()) + .unitAddress(memberInvoiceTitle.getUnitAddress()) + .phoneNumber(memberInvoiceTitle.getPhoneNumber()) + .bankName(memberInvoiceTitle.getBankName()) + .bankAccountNumber(memberInvoiceTitle.getBankAccountNumber()) .build() ); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java index c13c9d339..e8e18eaa2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java @@ -2,6 +2,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderInvoiceRecord; import com.jsowell.pile.dto.QueryInvoiceRecordDTO; +import org.springframework.stereotype.Repository; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; * @author jsowell * @date 2023-04-10 */ +@Repository public interface OrderInvoiceRecordMapper { /** * 查询申请开票 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java index 5d8adcac4..7fc7ef304 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java @@ -1,6 +1,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.MemberInvoiceTitle; +import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import java.util.List; @@ -11,6 +12,8 @@ import java.util.List; * @date 2023-04-13 */ public interface IMemberInvoiceTitleService { + InvoiceTitleVO selectByTitleId(String titleId); + /** * 查询会员发票抬头 * 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 21fb90be6..ee4fd8185 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 @@ -1,9 +1,11 @@ package com.jsowell.pile.service.impl; +import com.jsowell.common.enums.TitleTypeEnum; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.MemberInvoiceTitle; import com.jsowell.pile.mapper.MemberInvoiceTitleMapper; import com.jsowell.pile.service.IMemberInvoiceTitleService; +import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +22,24 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService @Autowired private MemberInvoiceTitleMapper memberInvoiceTitleMapper; + @Override + public InvoiceTitleVO selectByTitleId(String titleId) { + MemberInvoiceTitle memberInvoiceTitle = memberInvoiceTitleMapper.selectMemberInvoiceTitleById(Long.parseLong(titleId)); + if (memberInvoiceTitle == null) { + return null; + } + return InvoiceTitleVO.builder() + .titleId(memberInvoiceTitle.getId() + "") + .titleName(memberInvoiceTitle.getName()) + .titleType(TitleTypeEnum.getLabel(memberInvoiceTitle.getTitleType())) + .taxId(memberInvoiceTitle.getTaxId()) + .unitAddress(memberInvoiceTitle.getUnitAddress()) + .phoneNumber(memberInvoiceTitle.getPhoneNumber()) + .bankName(memberInvoiceTitle.getBankName()) + .bankAccountNumber(memberInvoiceTitle.getBankAccountNumber()) + .build(); + } + /** * 查询会员发票抬头 * 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 b8b4d7b02..9f542c530 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 @@ -18,4 +18,29 @@ public class InvoiceTitleVO { // 抬头类型 (单位或个人) private String titleType; + + /** + * 税号 + */ + private String taxId; + + /** + * 单位地址 + */ + private String unitAddress; + + /** + * 电话号码 + */ + private String phoneNumber; + + /** + * 开户银行 + */ + private String bankName; + + /** + * 银行账户 + */ + private String bankAccountNumber; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java new file mode 100644 index 000000000..cb0b5a163 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java @@ -0,0 +1,48 @@ +package com.jsowell.pile.vo.web; + +import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class InvoiceRecordVO { + /** + * 申请记录主键id + */ + private String id; + + /** + * 会员id + */ + private String memberId; + + /** + * 状态 0-未开票 1-已开票 + */ + private String status; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 更新时间x + */ + private String updateTime; + + /** + * 发票抬头信息 + */ + private InvoiceTitleVO invoiceTitle; + + /** + * 订单明细 + */ + // private List<> orderList; +}