- * 财务子表 前端控制器 - *
- * - * @author James Zow - * @since 2023-09-05 - */ @RestController -@RequestMapping("/financialSub") -public class FinancialSubController { - +@RequestMapping("/financial/collection") +public class CollectionReceiptController { } diff --git a/core/api/src/main/java/com/wansenai/api/financial/FinancialMainController.java b/core/api/src/main/java/com/wansenai/api/financial/ExpenseReceiptController.java similarity index 81% rename from core/api/src/main/java/com/wansenai/api/financial/FinancialMainController.java rename to core/api/src/main/java/com/wansenai/api/financial/ExpenseReceiptController.java index 444c458b..b6bb4192 100644 --- a/core/api/src/main/java/com/wansenai/api/financial/FinancialMainController.java +++ b/core/api/src/main/java/com/wansenai/api/financial/ExpenseReceiptController.java @@ -12,20 +12,10 @@ */ package com.wansenai.api.financial; - import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - *- * 财务主表 前端控制器 - *
- * - * @author James Zow - * @since 2023-09-05 - */ @RestController -@RequestMapping("/financialMain") -public class FinancialMainController { - +@RequestMapping("/financial/expense") +public class ExpenseReceiptController { } diff --git a/core/api/src/main/java/com/wansenai/api/financial/IncomeReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/IncomeReceiptController.java new file mode 100644 index 00000000..784165a2 --- /dev/null +++ b/core/api/src/main/java/com/wansenai/api/financial/IncomeReceiptController.java @@ -0,0 +1,21 @@ +/* + * 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.api.financial; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/financial/income") +public class IncomeReceiptController { +} diff --git a/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java new file mode 100644 index 00000000..f29bfcd3 --- /dev/null +++ b/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java @@ -0,0 +1,21 @@ +/* + * 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.api.financial; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/financial/payment") +public class PaymentReceiptController { +} diff --git a/core/api/src/main/java/com/wansenai/api/financial/TransferReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/TransferReceiptController.java new file mode 100644 index 00000000..e68a183b --- /dev/null +++ b/core/api/src/main/java/com/wansenai/api/financial/TransferReceiptController.java @@ -0,0 +1,21 @@ +/* + * 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.api.financial; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/financial/transfer") +public class TransferReceiptController { +} diff --git a/core/domain/src/main/java/com/wansenai/bo/IncomeExpenseBO.java b/core/domain/src/main/java/com/wansenai/bo/IncomeExpenseBO.java new file mode 100644 index 00000000..3b0431f5 --- /dev/null +++ b/core/domain/src/main/java/com/wansenai/bo/IncomeExpenseBO.java @@ -0,0 +1,37 @@ +/* + * 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.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IncomeExpenseBO { + + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long id; + + @JsonSerialize(using = BigDecimalSerializerBO.class) + private BigDecimal incomeExpenseAmount; + + private String remark; +} diff --git a/core/domain/src/main/java/com/wansenai/dto/financial/AddOrUpdateIncomeDTO.java b/core/domain/src/main/java/com/wansenai/dto/financial/AddOrUpdateIncomeDTO.java new file mode 100644 index 00000000..be18026e --- /dev/null +++ b/core/domain/src/main/java/com/wansenai/dto/financial/AddOrUpdateIncomeDTO.java @@ -0,0 +1,44 @@ +/* + * 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.financial; + +import com.wansenai.bo.FileDataBO; +import com.wansenai.bo.IncomeExpenseBO; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +public class AddOrUpdateIncomeDTO { + + private Long id; + + private Long relatedPersonId; + + private String receiptDate; + + private String receiptNumber; + + private Long financialPersonId; + + private Long incomeAccountId; + + private BigDecimal incomeAmount; + + private String remark; + + private List