Merge pull request #241 from Jzow/master

Add Supplier and Customer modula bill report apis and views

core/api/src/main/java/com/wansenai/api/report/ReportController.java

@@ -101,4 +101,24 @@ public Response<Page<ShipmentsSummaryVO>> getShipmentsSummary(@RequestBody Query
     public Response<Page<StorageSummaryVO>> getStorageSummary(@RequestBody QueryStorageSummaryDTO queryStorageSummaryDTO) {
         return receiptService.getStorageSummary(queryStorageSummaryDTO);
     }
+
+    @PostMapping("customerBill")
+    public Response<Page<CustomerBillVO>> getCustomerBill(@RequestBody QueryCustomerBillDTO queryCustomerBillDTO) {
+        return receiptService.getCustomerBill(queryCustomerBillDTO);
+    }
+
+    @PostMapping("customerBillDetail")
+    public Response<Page<CustomerBillDetailVO>> getCustomerBillDetail(@RequestBody QueryCustomerBillDetailDTO queryCustomerBillDetailDTO) {
+        return receiptService.getCustomerBillDetail(queryCustomerBillDetailDTO);
+    }
+
+    @PostMapping("supplierBill")
+    public Response<Page<SupplierBillVO>> getSupplierBill(@RequestBody QuerySupplierBillDTO querySupplierBillDTO) {
+        return receiptService.getSupplierBill(querySupplierBillDTO);
+    }
+
+    @PostMapping("supplierBillDetail")
+    public Response<Page<SupplierBillDetailVO>> getSupplierBillDetail(@RequestBody QuerySupplierBillDetailDTO querySupplierBillDetailDTO) {
+        return receiptService.getSupplierBillDetail(querySupplierBillDetailDTO);
+    }
 }

core/domain/src/main/java/com/wansenai/dto/report/QueryCustomerBillDTO.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.dto.report;
+
+import lombok.Data;
+
+@Data
+public class QueryCustomerBillDTO {
+
+    private Long customerId;
+
+    private String startDate;
+
+    private String endDate;
+
+    private Integer page;
+
+    private Integer pageSize;
+}

core/domain/src/main/java/com/wansenai/dto/report/QueryCustomerBillDetailDTO.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.dto.report;
+
+import lombok.Data;
+
+@Data
+public class QueryCustomerBillDetailDTO {
+
+    private Long customerId;
+
+    private String receiptNumber;
+
+    private String productInfo;
+
+    private String startDate;
+
+    private String endDate;
+
+    private Integer page;
+
+    private Integer pageSize;
+}

core/domain/src/main/java/com/wansenai/dto/report/QuerySupplierBillDTO.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.dto.report;
+
+import lombok.Data;
+
+@Data
+public class QuerySupplierBillDTO {
+
+    private Long supplierId;
+
+    private String startDate;
+
+    private String endDate;
+
+    private Integer page;
+
+    private Integer pageSize;
+}

core/domain/src/main/java/com/wansenai/dto/report/QuerySupplierBillDetailDTO.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.dto.report;
+
+import lombok.Data;
+
+@Data
+public class QuerySupplierBillDetailDTO {
+
+    private Long supplierId;
+
+    private String receiptNumber;
+
+    private String productInfo;
+
+    private String startDate;
+
+    private String endDate;
+
+    private Integer page;
+
+    private Integer pageSize;
+}

core/domain/src/main/java/com/wansenai/vo/report/CustomerBillDetailVO.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.vo.report;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wansenai.bo.BigDecimalSerializerBO;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+public class CustomerBillDetailVO {
+
+    private String receiptNumber;
+
+    private String customerName;
+
+    private String productInfo;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime receiptDate;
+
+    private String operator;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal thisReceiptArrears;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal receivedArrears;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal receivableArrears;
+}

core/domain/src/main/java/com/wansenai/vo/report/CustomerBillVO.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.vo.report;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wansenai.bo.BigDecimalSerializerBO;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class CustomerBillVO {
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long customerId;
+
+    private String customerName;
+
+    private String contactName;
+
+    private String contactPhone;
+
+    private String email;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal firstQuarterReceivable;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal secondQuarterReceivable;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal thirdQuarterReceivable;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal fourthQuarterReceivable;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal totalQuarterReceivable;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal totalQuarterArrears;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal remainingReceivableArrears;
+}

core/domain/src/main/java/com/wansenai/vo/report/SupplierBillDetailVO.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.vo.report;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wansenai.bo.BigDecimalSerializerBO;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+public class SupplierBillDetailVO {
+
+    private String receiptNumber;
+
+    private String supplierName;
+
+    private String productInfo;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime receiptDate;
+
+    private String operator;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal thisReceiptArrears;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal prepaidArrears;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal paymentArrears;
+}

core/domain/src/main/java/com/wansenai/vo/report/SupplierBillVO.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.vo.report;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wansenai.bo.BigDecimalSerializerBO;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class SupplierBillVO {
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long supplierId;
+
+    private String supplierName;
+
+    private String contactName;
+
+    private String contactPhone;
+
+    private String email;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal firstQuarterPayment;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal secondQuarterPayment;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal thirdQuarterPayment;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal fourthQuarterPayment;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal totalPayment;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal totalArrears;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal remainingPaymentArrears;
+}

core/service/src/main/java/com/wansenai/service/receipt/ReceiptService.java

@@ -63,4 +63,12 @@ public interface ReceiptService {
     Response<Page<StorageSummaryVO>> getStorageSummary(QueryStorageSummaryDTO queryStorageSummaryDTO);
 
     Response<List<RelatedPersonVO>> getRelatedPerson();
+
+    Response<Page<CustomerBillVO>> getCustomerBill(QueryCustomerBillDTO queryCustomerBillDTO);
+
+    Response<Page<CustomerBillDetailVO>> getCustomerBillDetail(QueryCustomerBillDetailDTO queryCustomerBillDetailDTO);
+
+    Response<Page<SupplierBillVO>> getSupplierBill(QuerySupplierBillDTO querySupplierBillDTO);
+
+    Response<Page<SupplierBillDetailVO>> getSupplierBillDetail(QuerySupplierBillDetailDTO querySupplierBillDetailDTO);
 }