diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java index 27ce2744..5fc09756 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/api/XhpcInvoiceApiController.java @@ -47,7 +47,7 @@ public class XhpcInvoiceApiController extends BaseController { @GetMapping(value = "/selectSpecificInvoiced") public AjaxResult selectSpecificInvoiced(@RequestParam Long invoiceId) { - SpecificInvoicedResponse specificInvoicedResponse = xhpcInvoiceService.selectInvoiceHistoryRecords(invoiceId); + SpecificInvoicedResponse specificInvoicedResponse = xhpcInvoiceService.selectSpecificInvoiced(invoiceId); return AjaxResult.success(specificInvoicedResponse); } diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsRequest.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsRequest.java new file mode 100644 index 00000000..bf436a30 --- /dev/null +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsRequest.java @@ -0,0 +1,27 @@ +package com.xhpc.invoice.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * /selectInvoiceHistoryRecords接口请求包装类 + * + * @author WH + * @date 2021/12/27 14:18 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class InvoiceHistoryRecordsRequest { + + @JsonProperty("creatorId") + private Long creatorId; + @JsonProperty("creatorType") + private Integer creatorType; + @JsonProperty("currentPage") + private Integer currentPage; + @JsonProperty("items") + private Long items; + +} diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsResponse.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsResponse.java new file mode 100644 index 00000000..3656ed30 --- /dev/null +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/InvoiceHistoryRecordsResponse.java @@ -0,0 +1,41 @@ +package com.xhpc.invoice.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +/** + * /selectInvoiceHistoryRecords接口的返回数据包装类 + * + * @author WH + * @date 2021/12/27 14:34 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class InvoiceHistoryRecordsResponse { + + @JsonProperty("totalItems") + private Long totalItems; + @JsonProperty("items") + private List items; + + @NoArgsConstructor + @Data + public static class ItemsDTO { + + @JsonProperty("invoiceId") + private Long invoiceId; + @JsonProperty("createTime") + private String createTime; + @JsonProperty("status") + private Integer status; + @JsonProperty("invoicingMoney") + private BigDecimal invoicingMoney; + + } + +} diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/XhpcInvoiceService.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/XhpcInvoiceService.java index 97e1878a..9ca9c512 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/XhpcInvoiceService.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/XhpcInvoiceService.java @@ -97,6 +97,6 @@ public interface XhpcInvoiceService { * @date 2021/12/27 13:12 * @since version-1.0 */ - SpecificInvoicedResponse selectInvoiceHistoryRecords(Long invoiceId); + SpecificInvoicedResponse selectSpecificInvoiced(Long invoiceId); } diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index 60213d47..75b4575f 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -216,7 +216,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { * @since version-1.0 */ @Override - public SpecificInvoicedResponse selectInvoiceHistoryRecords(Long invoiceId) { + public SpecificInvoicedResponse selectSpecificInvoiced(Long invoiceId) { //对拷发票部分数据 XhpcInvoice xhpcInvoice = xhpcInvoiceMapper.selectByPrimaryKey(invoiceId);