Merge pull request #208 from Jzow/master

Add shipments and storage summary api and views
eairps · Nov 20, 2023 · cd86ffb · cd86ffb
2 parents cdc2064 + 61dbda4
commit cd86ffb
Show file tree

Hide file tree

Showing 13 changed files with 785 additions and 59 deletions.
diff --git a/core/domain/src/main/java/com/wansenai/vo/report/ShipmentsSummaryVO.java b/core/domain/src/main/java/com/wansenai/vo/report/ShipmentsSummaryVO.java
@@ -19,6 +19,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 @Builder
@@ -39,8 +40,11 @@ public class ShipmentsSummaryVO {
 
     private String productUnit;
 
-    private Integer ShipmentsNumber;
+    private Integer shipmentsNumber;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    private BigDecimal ShipmentsAmount;
+    private BigDecimal shipmentsAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/report/StorageSummaryVO.java b/core/domain/src/main/java/com/wansenai/vo/report/StorageSummaryVO.java
@@ -19,6 +19,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 @Builder
@@ -43,4 +44,7 @@ public class StorageSummaryVO {
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
     private BigDecimal storageAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
 }
diff --git a/core/service/src/main/java/com/wansenai/service/common/CommonService.java b/core/service/src/main/java/com/wansenai/service/common/CommonService.java
@@ -36,6 +36,8 @@ public interface CommonService {
 
     String getProductName(Long productId);
 
+    String getProductCategoryName(Long productCategoryId);
+
     String getWarehouseName(Long warehouseId);
 
     String getMemberName(Long memberId);

diff --git a/core/service/src/main/java/com/wansenai/service/common/CommonServiceImpl.java b/core/service/src/main/java/com/wansenai/service/common/CommonServiceImpl.java
@@ -19,6 +19,7 @@
 import com.tencentcloudapi.sms.v20190711.SmsClient;
 import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest;
 import com.wansenai.bo.FileDataBO;
+import com.wansenai.entities.product.ProductCategory;
 import com.wansenai.entities.warehouse.Warehouse;
 import com.wansenai.mappers.system.SysFileMapper;
 import com.wansenai.service.BaseService;
@@ -728,6 +729,13 @@ public String getProductName(Long productId) {
                 .orElse(NullString);
     }
 
+    @Override
+    public String getProductCategoryName(Long productCategoryId) {
+        return Optional.ofNullable(productCategoryService.getById(productCategoryId))
+                .map(ProductCategory::getCategoryName)
+                .orElse(NullString);
+    }
+
     @Override
     public String getWarehouseName(Long warehouseId) {
         return Optional.ofNullable(warehouseService.getById(warehouseId))

diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java
@@ -426,6 +426,7 @@ public Response<String> addOrUpdatePurchaseOrder(PurchaseOrderDTO purchaseOrderD
                             .taxIncludedAmount(item.getTaxTotalPrice())
                             .remark(item.getRemark())
                             .updateBy(userId)
+                            .createTime(LocalDateTime.now())
                             .updateTime(LocalDateTime.now())
                             .build())
                     .collect(Collectors.toList());
@@ -702,6 +703,7 @@ public Response<String> addOrUpdatePurchaseStorage(PurchaseStorageDTO purchaseSt
                             .taxAmount(item.getTaxAmount())
                             .taxIncludedAmount(item.getTaxTotalPrice())
                             .updateBy(userId)
+                            .createTime(LocalDateTime.now())
                             .updateTime(LocalDateTime.now())
                             .build())
                     .collect(Collectors.toList());
@@ -1005,6 +1007,7 @@ public Response<String> addOrUpdatePurchaseRefund(PurchaseRefundDTO purchaseRefu
                             .taxAmount(item.getTaxAmount())
                             .taxIncludedAmount(item.getTaxTotalPrice())
                             .updateBy(userId)
+                            .createTime(LocalDateTime.now())
                             .updateTime(LocalDateTime.now())
                             .build())
                     .collect(Collectors.toList());

diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java
@@ -378,6 +378,7 @@ public Response<String> addOrUpdateRetailShipments(RetailShipmentsDTO shipmentsD
                             .productBarcode(item.getBarCode())
                             .warehouseId(item.getWarehouseId())
                             .updateBy(userId)
+                            .createTime(LocalDateTime.now())
                             .updateTime(LocalDateTime.now())
                             .build())
                     .collect(Collectors.toList());
@@ -650,6 +651,7 @@ public Response<String> addOrUpdateRetailRefund(RetailRefundDTO refundDTO) {
                             .productBarcode(item.getBarCode())
                             .warehouseId(item.getWarehouseId())
                             .updateBy(userId)
+                            .createTime(LocalDateTime.now())
                             .updateTime(LocalDateTime.now())
                             .build())
                     .collect(Collectors.toList());

diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java
@@ -704,6 +704,7 @@ public Response<String> addOrUpdateSaleShipments(SaleShipmentsDTO shipmentsDTO)
                             .taxAmount(item.getTaxAmount())
                             .taxIncludedAmount(item.getTaxTotalPrice())
                             .updateBy(userId)
+                            .createTime(LocalDateTime.now())
                             .updateTime(LocalDateTime.now())
                             .build())
                     .collect(Collectors.toList());
@@ -718,11 +719,9 @@ public Response<String> addOrUpdateSaleShipments(SaleShipmentsDTO shipmentsDTO)
                 var accountBalance = account.getCurrentAmount();
                 var thisCollectAmount = shipmentsDTO.getThisCollectAmount();
                 var beforeChangeAmount = beforeReceipt.stream()
-                        .map(item -> item.getTotalAmount())
+                        .map(ReceiptSaleSub::getTotalAmount)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
-                if (beforeChangeAmount != null) {
-                    accountBalance = accountBalance.subtract(beforeChangeAmount);
-                }
+                accountBalance = accountBalance.subtract(beforeChangeAmount);
                 if (thisCollectAmount != null) {
                     accountBalance = accountBalance.add(thisCollectAmount);
                 }
@@ -1010,6 +1009,7 @@ public Response<String> addOrUpdateSaleRefund(SaleRefundDTO refundDTO) {
                             .taxAmount(item.getTaxAmount())
                             .taxIncludedAmount(item.getTaxTotalPrice())
                             .updateBy(userId)
+                            .createTime(LocalDateTime.now())
                             .updateTime(LocalDateTime.now())
                             .build())
                     .collect(Collectors.toList());