diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/funds/ExecutorFundsApi.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/funds/ExecutorFundsApi.java deleted file mode 100644 index 624ebe9f0..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/funds/ExecutorFundsApi.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cf.imes.module.executor.api.funds; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.module.executor.enums.ApiConstants; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -import java.math.BigDecimal; - -/** - * @author 资金管理feign接口 - */ -@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory = -@Tag(name = "RPC 服务 - 资金管理") -public interface ExecutorFundsApi { - - String PREFIX = ApiConstants.PREFIX + "/funds"; - - - - @GetMapping(PREFIX +"/getInvoiceAmount") - @Operation(summary = "查询待审核的发票金额") - CommonResult getToExamineAmount(); - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/funds/ExecutorFundsApiImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/funds/ExecutorFundsApiImpl.java deleted file mode 100644 index be96c4140..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/funds/ExecutorFundsApiImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.executor.api.funds; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.module.executor.dal.mysql.funds.invoice.InvoiceRecordsMapper; -import com.cf.imes.module.executor.enums.amount.InvoiceStatusEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; -import java.math.BigDecimal; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@Validated -@Slf4j -public class ExecutorFundsApiImpl implements ExecutorFundsApi{ - - - - @Resource - private InvoiceRecordsMapper invoiceRecordsMapper; - - - - @Override - public CommonResult getToExamineAmount() { - - BigDecimal examineAmount = invoiceRecordsMapper.selectToExamineAmount(InvoiceStatusEnum.PENDINGINVOICING.getStatus()); - - return CommonResult.success(examineAmount); - - } - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/BalanceDetailsController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/BalanceDetailsController.java deleted file mode 100644 index 84f69b50d..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/BalanceDetailsController.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.balancedetails; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.excel.core.util.ExcelUtils; -import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsRespVO; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsPageReqVO; -import com.cf.imes.module.executor.service.funds.balancedetails.BalanceDetailsService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; - -import java.io.IOException; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; - -/** - * @author 组织余额明细 - */ -@Tag(name = "管理后台 - 组织余额明细") -@RestController -@RequestMapping("/executor/balance") -@Validated -public class BalanceDetailsController { - - - @Resource - private BalanceDetailsService balanceDetailsService; - - - - @GetMapping("") - @Operation(summary = "获取组织余额明细") - public CommonResult> getBalanceDetailsPage(@Valid BalanceDetailsPageReqVO pageReqVO) { - - return success(balanceDetailsService.getBalanceDetailsPage(pageReqVO)); - - } - - - - - @GetMapping("/export") - @Operation(summary = "组织余额明细导出") - @OperateLog(type = EXPORT) - public void balanceDetailsExport(@Valid BalanceDetailsPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = balanceDetailsService.getBalanceDetailsPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "余额明细表.xls", "数据", BalanceDetailsRespVO.class, - BeanUtils.toBean(list, BalanceDetailsRespVO.class)); - - } - - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/vo/BalanceDetailsPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/vo/BalanceDetailsPageReqVO.java deleted file mode 100644 index 1982807da..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/vo/BalanceDetailsPageReqVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDate; - -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; - - -@Schema(description = "管理后台 - 组织余额明细分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@Builder -public class BalanceDetailsPageReqVO extends PageParam { - - - @Schema(description = "流水号") - private Long id; - - - @Schema(description = "组织名称") - private String organName; - - - @Schema(description = "交易类型") - private Integer tradeType; - - - @Schema(description = "收支类型") - private Integer incomeExpenseType; - - - @Schema(description = "创建时间", example = "[2022-07-01 ,2022-07-01]") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDate[] createTime; - - - @Schema(description = "组织ID") - private Long organId; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java deleted file mode 100644 index e625d44c8..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo; - - -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -@Data -public class BalanceDetailsRespVO { - - - @Schema(description = "流水号") - @ExcelProperty("流水号") - private Long businessNo; - - - @Schema(description = "交易类型,0充值 1软件购买") - @ExcelProperty("交易类型") - private Integer tradeType; - - - @Schema(description = "收支类型,0收入 1支出") - private Integer incomeExpenseType; - - - @Schema(description = "入账现金") - @ExcelProperty("入账现金") - private BigDecimal entryAmount; - - - @Schema(description = "入账赠送金") - @ExcelProperty("入账赠送金") - private BigDecimal entryGiftAmount; - - - @Schema(description = "支出现金") - @ExcelProperty("支出现金") - private BigDecimal expensesAmount; - - - @Schema(description = "支出赠送金") - @ExcelProperty("支出赠送金") - private BigDecimal expensesGiftAmount; - - - @Schema(description = "可用金额") - @ExcelProperty("可用金额") - private BigDecimal availableAmount; - - - @Schema(description = "现金金额") - @ExcelProperty("现金金额") - private BigDecimal amount; - - - @Schema(description = "赠送金额") - @ExcelProperty("赠送金额") - private BigDecimal giftAmount; - - - @Schema(description = "交易时间") - @ExcelProperty("交易时间") - private LocalDateTime createTime; - - - @Schema(description = "操作人") - @ExcelProperty("操作人") - private LocalDateTime creator; - - - @Schema(description = "支出/入账现金金额") - private BigDecimal cashAmountChange; - - - - @Schema(description = "支出/入账赠送金金额") - private BigDecimal bonusAmountChange; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/bill/BillController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/bill/BillController.java deleted file mode 100644 index f3f616d3d..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/bill/BillController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.bill; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.excel.core.util.ExcelUtils; -import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.bill.vo.BillDetailsRespVO; -import com.cf.imes.module.executor.service.funds.bill.BillService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import java.io.IOException; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; - -/** - * @author 账单/总额明细 - */ -@Tag(name = "管理后台 - 账单/总额明细") -@RestController -@RequestMapping("/executor/bill") -@Validated -public class BillController { - - - @Resource - private BillService billService; - - - - @GetMapping("") - @Operation(summary = "获取组织账单明细") - public CommonResult> getBillDetailsPage(@Valid BalanceDetailsPageReqVO pageReqVO) { - - return success(billService.getBillDetailsPage(pageReqVO)); - - } - - - - - @GetMapping("/export") - @Operation(summary = "组织账单明细下载") - @OperateLog(type = EXPORT) - public void billDetailsExport(@Valid BalanceDetailsPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = billService.getBillDetailsPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "余额明细表.xls", "数据", BillDetailsRespVO.class,list); - - } - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/bill/vo/BillDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/bill/vo/BillDetailsRespVO.java deleted file mode 100644 index 70c28f5d8..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/bill/vo/BillDetailsRespVO.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.bill.vo; - - -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -@Data -public class BillDetailsRespVO { - - - @Schema(description = "流水号") - @ExcelProperty("流水号") - private Long businessNo; - - - @Schema(description = "交易类型-枚举类-") - private Integer tradeType; - - - @Schema(description = "收支类型-枚举类") - private Integer incomeExpenseType; - - - - @Schema(description = "充值金额") - @ExcelProperty("充值金额") - private BigDecimal rechargeAmount; - - - @Schema(description = "产品金额") - @ExcelProperty("产品金额") - private BigDecimal productAmount; - - - - @Schema(description = "支出现金") - @ExcelProperty("支出现金") - private BigDecimal cashExpenditure; - - - - @Schema(description = "支出账户余额") - @ExcelProperty("支出账户余额") - private BigDecimal expenditureAccountBalance; - - - @Schema(description = "实际支出总费用") - @ExcelProperty("实际支出总费用") - private BigDecimal actualTotalExpenditure; - - - @Schema(description = "交易时间") - @ExcelProperty("交易时间") - private LocalDateTime createTime; - - - @Schema(description = "操作人") - @ExcelProperty("操作人") - private LocalDateTime creator; - - - @Schema(description = "支出/入账现金金额") - private BigDecimal cashAmountChange; - - - @Schema(description = "支出/入账赠送金金额") - private BigDecimal bonusAmountChange; - - - @Schema(description = "可用余额") - private BigDecimal availableAmount; - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/InvoiceController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/InvoiceController.java deleted file mode 100644 index f52dbe74c..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/InvoiceController.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.executor.controller.admin.funds.invoice.vo.*; -import com.cf.imes.module.executor.service.funds.invoice.InvoiceService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.IMPORT; - -/** - * @author 发票管理 - */ -@Tag(name = "管理后台 - 发票管理") -@RestController -@RequestMapping("/executor/invoice") -@Validated -public class InvoiceController { - - - @Resource - private InvoiceService invoiceService; - - - - @GetMapping("/{organId}") - @Operation(summary = "获取组织的开票金额信息") - @Parameter(name = "organId", description = "组织ID", required = true, example = "1") - public CommonResult getInvoiceAmount(@PathVariable("organId") Long organId) { - - return success(invoiceService.getInvoiceAmount(organId)); - - } - - - - - - @GetMapping("/details") - @Operation(summary = "获取组织可开票数据明细") - public CommonResult> getInvoiceDetails(@Valid InvoiceDetailsPageReqVO pageReqVO) { - - return success(invoiceService.getInvoiceDetails(pageReqVO)); - - } - - - - - - @GetMapping("/records") - @Operation(summary = "获取组织的开票记录") - public CommonResult> getInvoiceRecords(@Valid InvoiceDetailsPageReqVO pageReqVO) { - - return success(invoiceService.getInvoiceRecords(pageReqVO)); - - } - - - - - @GetMapping("/invoice") - @Parameter(name = "invoiceId", description = "发票ID", required = true) - @Operation(summary = "获取发票对应的购买记录和抬头信息") - public CommonResult getInvoiceIncome(@Valid @RequestParam("invoiceId") Long invoiceId) { - - return success(invoiceService.getInvoiceIncome(invoiceId)); - - } - - - - - - @PostMapping("") - @Operation(summary = "组织新增开票记录") - public CommonResult insetInvoiceRecords(@Valid @RequestBody InvoiceRecordsReqVO reqVO) { - - invoiceService.insetInvoiceRecords(reqVO); - - return success(Boolean.TRUE); - - } - - - - - - @PutMapping("") - @Operation(summary = "同意/拒绝开票") - public CommonResult invoicing(@Valid @RequestBody InvoiceInvoicingReqVO reqVO) { - - invoiceService.invoicing(reqVO); - - return success(Boolean.TRUE); - - } - - - - - @PostMapping("/upload") - @Operation(summary = "发票上传") - @Parameter(name = "invoiceId", description = "发票ID", required = true) - @OperateLog(type = IMPORT) - public CommonResult uploadInvoice(@RequestParam("file") MultipartFile file,@RequestParam("invoiceId") Long invoiceId) { - - invoiceService.uploadInvoice(file,invoiceId); - - return success(Boolean.TRUE); - - } - - - - - - @GetMapping("/download") - @Operation(summary = "发票文件下载") - @Parameter(name = "invoiceId", description = "发票ID", required = true) - public void downloadInvoice(@RequestParam("invoiceId") Long invoiceId, HttpServletResponse response) { - - invoiceService.downloadInvoice(invoiceId,response); - - } - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceAmountRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceAmountRespVO.java deleted file mode 100644 index e0c693ca2..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceAmountRespVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class InvoiceAmountRespVO { - - - @Schema(description = "可开票") - private BigDecimal invocable; - - - @Schema(description = "开票中") - private BigDecimal inTheInvoice; - - - @Schema(description = "已开票") - private BigDecimal invoiced; - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceDetailsPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceDetailsPageReqVO.java deleted file mode 100644 index 92a0a7f01..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceDetailsPageReqVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 组织可开票的数据明细 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@Builder -public class InvoiceDetailsPageReqVO extends PageParam { - - - @Schema(description = "组织ID") - private Long organId; - - - @Schema(description = "发票号") - private String invoiceNo; - - - @Schema(description = "发票状态，1待开票 2已开票 3开票失败") - private Integer status; - - - @Schema(description = "申请人") - private String creator; - - - @Schema(description = "开票人") - private String invoicePerson; - - - @Schema(description = "发票金额") - private BigDecimal[] invoiceAmount; - - - @Schema(description = "开票时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] invoiceTime; - - - @Schema(description = "交易时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - - @Schema(description = "交易金额") - private BigDecimal[] amount; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceDetailsRespVO.java deleted file mode 100644 index 02f23b00b..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceDetailsRespVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InvoiceDetailsRespVO { - - - @Schema(description = "发票对应的购买记录") - private List invoicePurchaseRecords; - - - @Schema(description = "发票抬头信息") - private InvoiceTitleInfo invoiceTitleInfo; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceFilePath.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceFilePath.java deleted file mode 100644 index 7015104da..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceFilePath.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - - -import lombok.Data; -import lombok.Getter; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -@Component -@Getter -@Data -public class InvoiceFilePath { - - @Value("${invoice.filepath:}") - private String filePath; - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceInvoicingReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceInvoicingReqVO.java deleted file mode 100644 index 9b947e4b9..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceInvoicingReqVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class InvoiceInvoicingReqVO { - - - @Schema(description = "发票抬头ID") - private Long id; - - - @Schema(description = "是否开票") - private Boolean isInvoicing; - - - @Schema(description = "发票号") - private String invoiceNo; - - - @Schema(description = "发票附件") - private String invoiceAttachmentPath; - - - @Schema(description = "备注") - private String remark; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoicePurchaseRecord.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoicePurchaseRecord.java deleted file mode 100644 index 0489bc99b..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoicePurchaseRecord.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - - -@Data -public class InvoicePurchaseRecord { - - - @Schema(description = "流水号") - private Long businessNo; - - - @Schema(description = "购买记录ID") - private Long purchaseRecordId; - - - @Schema(description = "产品名称") - private String productName; - - - @Schema(description = "交易类型") - private Integer tradeType; - - - @Schema(description = "可开票金额") - private BigDecimal rechargeAmount; - - - @Schema(description = "交易时间") - private LocalDateTime createTime; - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceRecordsReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceRecordsReqVO.java deleted file mode 100644 index c17df0af4..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceRecordsReqVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.List; - - -@Data -public class InvoiceRecordsReqVO { - - - @Schema(description = "购买记录ID") - private List purchaseRecordId; - - - @Schema(description = "发票金额") - private BigDecimal invoiceAmount; - - - @Schema(description = "发票抬头ID") - private Long invoiceTitleId; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceRecordsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceRecordsRespVO.java deleted file mode 100644 index 5ff8627f5..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceRecordsRespVO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -@Data -public class InvoiceRecordsRespVO { - - - @Schema(description = "发票ID") - private Long id; - - - @Schema(description = "组织ID") - private Long organId; - - - @Schema(description = "组织名称") - private String organName; - - - @Schema(description = "发票申请人ID") - private Long userId; - - - @Schema(description = "发票申请人名称") - private String creator; - - - @Schema(description = "发票号") - private String invoiceNo; - - - @Schema(description = "发票金额") - private BigDecimal invoiceAmount; - - - @Schema(description = "发票状态，1待开票 2已开票 3开票失败") - private Integer status; - - - @Schema(description = "发票附件保存路径") - private String invoiceAttachmentPath; - - - @Schema(description = "开票人") - private String invoicePerson; - - - @Schema(description = "开票人用户ID") - private Long invoicePersonId; - - - @Schema(description = "开票时间") - private LocalDateTime invoiceTime; - - - @Schema(description = "备注") - private String remark; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceTitleInfo.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceTitleInfo.java deleted file mode 100644 index 023a80ca1..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/invoice/vo/InvoiceTitleInfo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.invoice.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class InvoiceTitleInfo { - - - @Schema(description = "发票抬头ID") - private Long id; - - - @Schema(description = "组织ID") - private Long organId; - - - @Schema(description = "发票抬头") - private String invoiceTitle; - - - @Schema(description = "开具类型，0企业 1个人") - private Integer issueType; - - - @Schema(description = "发票类型，0增值税普通发票 1增值税专用发票") - private Integer invoiceType; - - - @Schema(description = "纳税人识别号") - private String taxpayerId; - - - @Schema(description = "开户银行名称") - private String bankName; - - - @Schema(description = "开户银行账号") - private String bankAccount; - - - @Schema(description = "注册场所地址") - private String registeredAddress; - - - @Schema(description = "注册固定电话") - private String fixedPhone; - - - @Schema(description = "邮箱") - private String email; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/PurchaseController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/PurchaseController.java deleted file mode 100644 index 2b7ec089a..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/PurchaseController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.purchase; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.excel.core.util.ExcelUtils; -import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.executor.controller.admin.funds.purchase.vo.PurchaseRecordPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.purchase.vo.PurchaseRecordRespVO; -import com.cf.imes.module.executor.service.funds.purchase.PurchaseService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import java.io.IOException; -import java.util.List; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; - -/** - * @author 软件购买 - */ -@Tag(name = "管理后台 - 软件购买") -@RestController -@RequestMapping("/executor/purchase") -@Validated -public class PurchaseController { - - - @Resource - private PurchaseService purchaseService; - - - @GetMapping("") - @Operation(summary = "获取软件的购买记录") - public CommonResult> getPurchaseRecord(@Valid PurchaseRecordPageReqVO pageReqVO) { - - return success(purchaseService.getPurchaseRecord(pageReqVO)); - - } - - - - - - @GetMapping("/export") - @Operation(summary = "导出软件购买记录") - @OperateLog(type = EXPORT) - public void billDetailsExport(@Valid PurchaseRecordPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = purchaseService.getPurchaseRecord(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "软件购买记录表.xls", "数据", PurchaseRecordRespVO.class, list); - - } - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java deleted file mode 100644 index 51dd20eca..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/vo/PurchaseRecordPageReqVO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.purchase.vo; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 组织购买记录明细 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@Builder -public class PurchaseRecordPageReqVO extends PageParam { - - - @Schema(description = "组织ID") - private Long organId; - - - @Schema(description = "产品名称") - private String productName; - - - @Schema(description = "购买月数") - private Integer purchaseMonths; - - - @Schema(description = "购买时间", example = "[2022-07-01 01:01:01 ,2022-07-01 01:01:01]") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - - @Schema(description = "操作人") - private String creator; - - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java deleted file mode 100644 index 107c5069c..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.funds.purchase.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - - -@Data -public class PurchaseRecordRespVO { - - - @Schema(description = "购买记录ID") - private Long id; - - - @Schema(description = "组织ID") - private Long organId; - - - @Schema(description = "产品ID") - private Long productId; - - - @Schema(description = "产品明细ID") - private Long productDetailsId; - - - @Schema(description = "产品名称") - private String productName; - - - @Schema(description = "购买月数") - private Integer purchaseMonths; - - - @Schema(description = "赠送月数") - private Integer giftMonths; - - - @Schema(description = "支付方式") - private Integer paymentMethod; - - - @Schema(description = "订单总额") - private BigDecimal totalAmount; - - - @Schema(description = "现金余额支出") - private BigDecimal accountBalanceSpent; - - - @Schema(description = "支付宝支出") - private BigDecimal alipaySpent; - - - @Schema(description = "微信支出") - private BigDecimal wechatSpent; - - - @Schema(description = "赠送金") - private BigDecimal giftMoneySpent; - - - @Schema(description = "货币类型") - private Integer currency; - - - @Schema(description = "货币单位") - private String currencyUnit; - - - @Schema(description = "是否开票") - private Integer isInvocing; - - - @Schema(description = "购买时间") - private LocalDateTime createTime; - - - @Schema(description = "操作人") - private String creator; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/balancedetails/IncomeExpenseDetailsDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/balancedetails/IncomeExpenseDetailsDO.java deleted file mode 100644 index af56cc4f3..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/balancedetails/IncomeExpenseDetailsDO.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.cf.imes.module.executor.dal.dataobject.funds.balancedetails; - - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -import java.math.BigDecimal; - -/** - * @author 收支明细表 - */ -@TableName("income_expense_details") -@KeySequence("income_expense_details_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class IncomeExpenseDetailsDO extends BaseDO { - - /** - * 主键 - */ - @TableId - private Long id; - - - /** - * 流水号 - */ - private String businessNo; - - - /** - * 组织ID - */ - private Long organId; - - - /** - * 充值-赠送金规则表 - */ - private Long giftMoneyId; - - - /** - * 购买-购买记录id - */ - private Long purchaseId; - - - /** - * 用户ID - */ - private Long userId; - - - /** - * 交易类型 - */ - private Integer tradeType; - - - /** - * 收支类型 - */ - private Integer incomeExpenseType; - - - /** - * 支出/入账现金金额 - */ - private BigDecimal cashAmountChange; - - - /** - * 支出/入账赠送金金额 - */ - private BigDecimal bonusAmountChange; - - - /** - * 可用余额 - */ - private BigDecimal availableAmount; - - - - /** - * 现金金额 - */ - private BigDecimal amount; - - - /** - * 赠送金额 - */ - private BigDecimal giftAmount; - - - /** - * 货币类型 - */ - private Integer currency; - - - /** - * 货币单位 - */ - private String currencyUnit; - - - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/invoice/InvoiceRecordsDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/invoice/InvoiceRecordsDO.java deleted file mode 100644 index 1165f3bbf..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/invoice/InvoiceRecordsDO.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.cf.imes.module.executor.dal.dataobject.funds.invoice; - - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * @author 开票记录表 - */ -@TableName("invoice_records") -@KeySequence("invoice_records_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InvoiceRecordsDO extends BaseDO { - - /** - * 主键 - */ - @TableId - private Long id; - - - /** - * 组织ID - */ - private Long organId; - - - /** - * 组织/发票抬头名称 - */ - private String organName; - - - /** - * 用户ID-发票申请人ID - */ - private Long userId; - - - /** - * 发票号 - */ - private String invoiceNo; - - - /** - * 购买记录单号 - */ - private String purchaseIds; - - - /** - * 发票金额 - */ - private BigDecimal invoiceAmount; - - - /** - * 发票状态，1待开票 2已开票 3开票失败 - */ - private Integer status; - - - /** - * 发票附件保存路径 - */ - private String invoiceAttachmentPath; - - - /** - * 开票人 - */ - private String invoicePerson; - - - /** - * 开票人用户ID - */ - private Long invoicePersonId; - - - /** - * 开票时间 - */ - private LocalDateTime invoiceTime; - - - - /** - * 抬头ID - */ - private Long invoiceTitleId; - - - /** - * 抬头 - */ - private String invoiceTitleInfo; - - - /** - * 备注 - */ - private String remark; - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/purchase/PurchaseRecordDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/purchase/PurchaseRecordDO.java deleted file mode 100644 index de966043d..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/funds/purchase/PurchaseRecordDO.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.cf.imes.module.executor.dal.dataobject.funds.purchase; - - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import lombok.*; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - - -/** - * @author 购买记录表 - */ -@TableName("purchase_record") -@KeySequence("purchase_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PurchaseRecordDO extends BaseDO { - - - /** - * 主键 - */ - @TableId - private Long id; - - - /** - * 组织ID - */ - private Long organId; - - - /** - * 用户ID-发票申请人ID - */ - private Long userId; - - - /** - * 用户姓名 - */ - private Long userName; - - - /** - * 产品ID - */ - private Long productId; - - - /** - * 产品明细ID - */ - private Long productDetailsId; - - - /** - * 产品名称 - */ - private String productName; - - - /** - * 购买月数 - */ - private Integer purchaseMonths; - - - /** - * 赠送月数 - */ - private Integer giftMonths; - - - /** - * 产品开始时间 - */ - private LocalDateTime startTime; - - - /** - * 产品结束时间 - */ - private LocalDateTime endTime; - - - /** - * 支付方式 - */ - private Integer paymentMethod; - - - /** - * 订单总额 - */ - private BigDecimal totalAmount; - - - /** - * 现金余额支出 - */ - private BigDecimal accountBalanceSpent; - - - /** - * 支付宝支出 - */ - private BigDecimal alipaySpent; - - - /** - * 微信支出 - */ - private BigDecimal wechatSpent; - - - - /** - * 赠送金 - */ - private BigDecimal giftMoneySpent; - - - - /** - * 货币类型 - */ - private Integer currency; - - - - /** - * 货币单位 - */ - private String currencyUnit; - - - - /** - * 是否开票 - */ - private Integer isInvocing; - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/balancedetails/IncomeExpenseDetailsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/balancedetails/IncomeExpenseDetailsMapper.java deleted file mode 100644 index f7f1a48c2..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/balancedetails/IncomeExpenseDetailsMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cf.imes.module.executor.dal.mysql.funds.balancedetails; - - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.invoice.vo.InvoiceDetailsRespVO; -import com.cf.imes.module.executor.dal.dataobject.funds.balancedetails.IncomeExpenseDetailsDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface IncomeExpenseDetailsMapper extends BaseMapperX { - - - - default PageResult selectDetailsPage(BalanceDetailsPageReqVO pageReqVO,List organIds) { - return selectPage(pageReqVO, new LambdaQueryWrapperX() - .eqIfPresent(IncomeExpenseDetailsDO::getOrganId, pageReqVO.getOrganId()) - .inIfPresent(IncomeExpenseDetailsDO::getOrganId,organIds) - .eq(IncomeExpenseDetailsDO::getDeleted, false) - .likeIfPresent(IncomeExpenseDetailsDO::getId,pageReqVO.getId() == null ? "" : String.valueOf(pageReqVO.getId())) - .eqIfPresent(IncomeExpenseDetailsDO::getTradeType,pageReqVO.getTradeType()) - .eqIfPresent(IncomeExpenseDetailsDO::getIncomeExpenseType,pageReqVO.getIncomeExpenseType()) - .betweenIfPresent(IncomeExpenseDetailsDO::getCreateTime,pageReqVO.getCreateTime())); - - } - - - IPage selectOrganInvoicable(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/invoice/InvoiceRecordsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/invoice/InvoiceRecordsMapper.java deleted file mode 100644 index dc0295a7a..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/invoice/InvoiceRecordsMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cf.imes.module.executor.dal.mysql.funds.invoice; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.executor.controller.admin.funds.invoice.vo.InvoiceDetailsPageReqVO; -import com.cf.imes.module.executor.dal.dataobject.funds.invoice.InvoiceRecordsDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; - - -@Mapper -public interface InvoiceRecordsMapper extends BaseMapperX { - - - default PageResult selectInvoiceRecordsPage(InvoiceDetailsPageReqVO pageReqVO) { - return selectPage(pageReqVO, new LambdaQueryWrapperX() - .eq(InvoiceRecordsDO::getDeleted,false) - .eqIfPresent(InvoiceRecordsDO::getOrganId,pageReqVO.getOrganId()) - .likeIfPresent(InvoiceRecordsDO::getInvoiceNo,pageReqVO.getInvoiceNo()) - .eqIfPresent(InvoiceRecordsDO::getStatus,pageReqVO.getStatus()) - .likeIfPresent(InvoiceRecordsDO::getCreator,pageReqVO.getCreator()) - .likeIfPresent(InvoiceRecordsDO::getInvoicePerson,pageReqVO.getInvoicePerson()) - .betweenIfPresent(InvoiceRecordsDO::getInvoiceAmount,pageReqVO.getInvoiceAmount()) - .betweenIfPresent(InvoiceRecordsDO::getCreateTime,pageReqVO.getCreateTime()) - .betweenIfPresent(InvoiceRecordsDO::getInvoiceTime,pageReqVO.getInvoiceTime())); - } - - - - BigDecimal selectToExamineAmount(@Param("status") Integer status); - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/purchase/PurchaseRecordMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/purchase/PurchaseRecordMapper.java deleted file mode 100644 index 9500867d3..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/funds/purchase/PurchaseRecordMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cf.imes.module.executor.dal.mysql.funds.purchase; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.executor.controller.admin.funds.invoice.vo.InvoiceAmountRespVO; -import com.cf.imes.module.executor.controller.admin.funds.invoice.vo.InvoicePurchaseRecord; -import com.cf.imes.module.executor.controller.admin.funds.purchase.vo.PurchaseRecordPageReqVO; -import com.cf.imes.module.executor.dal.dataobject.funds.purchase.PurchaseRecordDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface PurchaseRecordMapper extends BaseMapperX { - - - InvoiceAmountRespVO selectOrganInvoice(@Param("organId") Long organId); - - - - default PageResult selectPage(PurchaseRecordPageReqVO pageReqVO) { - return selectPage(pageReqVO, new LambdaQueryWrapperX() - .eq(PurchaseRecordDO::getDeleted,false) - .eqIfPresent(PurchaseRecordDO::getOrganId,pageReqVO.getOrganId()) - .likeIfPresent(PurchaseRecordDO::getProductName,pageReqVO.getProductName()) - .eqIfPresent(PurchaseRecordDO::getPurchaseMonths,pageReqVO.getPurchaseMonths()) - .betweenIfPresent(PurchaseRecordDO::getCreateTime,pageReqVO.getCreateTime()) - .likeIfPresent(PurchaseRecordDO::getCreator,pageReqVO.getCreator())); - - } - - List selectPurchaseRecord(@Param("purchaseIdList") List purchaseIdList, @Param("organId") Long organId); - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/rpc/config/RpcConfiguration.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/rpc/config/RpcConfiguration.java index a5b5d52ad..5b1777709 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/rpc/config/RpcConfiguration.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/rpc/config/RpcConfiguration.java @@ -5,7 +5,6 @@ import com.cf.imes.module.system.api.application.ApplicationApi; import com.cf.imes.module.system.api.customplateno.CustomPlateNoSeqApi; import com.cf.imes.module.system.api.dataSource.DataSourceApi; import com.cf.imes.module.system.api.dict.DictDataApi; -import com.cf.imes.module.system.api.funds.SystemFundsApi; import com.cf.imes.module.system.api.machine.MachineApi; import com.cf.imes.module.system.api.organ.OrganApi; import com.cf.imes.module.system.api.permission.PermissionApi; @@ -23,6 +22,6 @@ import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) @EnableFeignClients(clients = {AdminUserApi.class, MachineApi.class, DictDataApi.class, FileApi.class, ProcessGroupApi.class, FileApi.class, DataSourceApi.class, ApplicationApi.class, - ProcessApi.class, OrganApi.class, SystemConfigApi.class, CustomPlateNoSeqApi.class, PermissionApi.class, SettingApi.class, SystemFundsApi.class}) + ProcessApi.class, OrganApi.class, SystemConfigApi.class, CustomPlateNoSeqApi.class, PermissionApi.class, SettingApi.class}) public class RpcConfiguration { } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/balancedetails/BalanceDetailsService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/balancedetails/BalanceDetailsService.java deleted file mode 100644 index 63fe56be0..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/balancedetails/BalanceDetailsService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cf.imes.module.executor.service.funds.balancedetails; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsRespVO; - -/** - * @author 组织余额明细接口 - */ -public interface BalanceDetailsService { - - - PageResult getBalanceDetailsPage(BalanceDetailsPageReqVO pageReqVO); - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/balancedetails/BalanceDetailsServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/balancedetails/BalanceDetailsServiceImpl.java deleted file mode 100644 index 3fe9b2b7a..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/balancedetails/BalanceDetailsServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cf.imes.module.executor.service.funds.balancedetails; - - -import cn.hutool.core.collection.CollUtil; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsRespVO; -import com.cf.imes.module.executor.dal.dataobject.funds.balancedetails.IncomeExpenseDetailsDO; -import com.cf.imes.module.executor.dal.mysql.funds.balancedetails.IncomeExpenseDetailsMapper; -import com.cf.imes.module.executor.enums.amount.IncomeExpenseTypeEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import jakarta.annotation.Resource; - -/** - * @author 组织余额明细接口 实现类 - */ -@Slf4j -@Service -public class BalanceDetailsServiceImpl implements BalanceDetailsService{ - - - @Resource - private IncomeExpenseDetailsMapper incomeExpenseDetailsMapper; - - - - @Override - public PageResult getBalanceDetailsPage(BalanceDetailsPageReqVO pageReqVO) { - - PageResult pageResult = incomeExpenseDetailsMapper.selectDetailsPage(pageReqVO,null); - - if(CollUtil.isNotEmpty(pageResult.getList())){ - return new PageResult<>(); - } - - PageResult result = BeanUtils.toBean(pageResult, BalanceDetailsRespVO.class); - - - result.getList().forEach(f->{ - if(f.getIncomeExpenseType().equals(IncomeExpenseTypeEnum.INCOME.getType())){ - f.setEntryAmount(f.getCashAmountChange()); - f.setEntryGiftAmount(f.getBonusAmountChange()); - }else { - f.setExpensesAmount(f.getCashAmountChange()); - f.setExpensesGiftAmount(f.getBonusAmountChange()); - } - - }); - - return result; - } - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/bill/BillService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/bill/BillService.java deleted file mode 100644 index 7a747e8f8..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/bill/BillService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cf.imes.module.executor.service.funds.bill; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.bill.vo.BillDetailsRespVO; - -/** - * @author 账单/总额明细 接口 - */ -public interface BillService { - - - PageResult getBillDetailsPage(BalanceDetailsPageReqVO pageReqVO); - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/bill/BillServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/bill/BillServiceImpl.java deleted file mode 100644 index 5c6dadf7c..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/bill/BillServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.cf.imes.module.executor.service.funds.bill; - - -import cn.hutool.core.collection.CollUtil; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.module.executor.controller.admin.funds.balancedetails.vo.BalanceDetailsPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.bill.vo.BillDetailsRespVO; -import com.cf.imes.module.executor.dal.dataobject.funds.balancedetails.IncomeExpenseDetailsDO; -import com.cf.imes.module.executor.dal.mysql.funds.balancedetails.IncomeExpenseDetailsMapper; -import com.cf.imes.module.executor.enums.amount.IncomeExpenseTypeEnum; -import com.cf.imes.module.executor.enums.amount.TradeTypeEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import jakarta.annotation.Resource; - -/** - * @author 账单/总额明细接口 实现类 - */ -@Slf4j -@Service -public class BillServiceImpl implements BillService{ - - - @Resource - private IncomeExpenseDetailsMapper incomeExpenseDetailsMapper; - - @Override - public PageResult getBillDetailsPage(BalanceDetailsPageReqVO pageReqVO) { - - PageResult pageResult = incomeExpenseDetailsMapper.selectDetailsPage(pageReqVO,null); - - if(CollUtil.isNotEmpty(pageResult.getList())){ - return new PageResult<>(); - } - - PageResult result = BeanUtils.toBean(pageResult, BillDetailsRespVO.class); - - result.getList().forEach(f->{ - // 收支类型 - f.setIncomeExpenseType(IncomeExpenseTypeEnum.EXPENSES.getType()); - // 支出账户余额 - f.setExpenditureAccountBalance(f.getAvailableAmount()); - if(f.getTradeType().equals(TradeTypeEnum.INCOME.getType())){ - // 充值金额 - f.setRechargeAmount(f.getCashAmountChange()); - // 支出现金 - f.setCashExpenditure(f.getCashAmountChange()); - // 实际支出总费用 - f.setActualTotalExpenditure(f.getCashAmountChange()); - - }else if(f.getTradeType().equals(TradeTypeEnum.EXPENSES.getType())){ - // 产品金额 - f.setProductAmount(f.getCashAmountChange().add(f.getBonusAmountChange())); - // 支出现金 - f.setCashExpenditure(f.getCashAmountChange()); - // 实际支出总费用 - f.setActualTotalExpenditure(f.getCashAmountChange().add(f.getBonusAmountChange())); - - } - }); - - return result; - - } - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/invoice/InvoiceService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/invoice/InvoiceService.java deleted file mode 100644 index e352ce282..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/invoice/InvoiceService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cf.imes.module.executor.service.funds.invoice; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.executor.controller.admin.funds.invoice.vo.*; -import org.springframework.web.multipart.MultipartFile; - -import jakarta.servlet.http.HttpServletResponse; - -/** - * @author 发票管理接口 - */ -public interface InvoiceService { - - - InvoiceAmountRespVO getInvoiceAmount(Long organId); - - - PageResult getInvoiceDetails(InvoiceDetailsPageReqVO pageReqVO); - - - PageResult getInvoiceRecords(InvoiceDetailsPageReqVO pageReqVO); - - - void insetInvoiceRecords(InvoiceRecordsReqVO reqVO); - - - InvoiceDetailsRespVO getInvoiceIncome(Long invoiceId); - - - void invoicing(InvoiceInvoicingReqVO reqVO); - - void uploadInvoice(MultipartFile file, Long invoiceId); - - void downloadInvoice(Long invoiceId, HttpServletResponse response); - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/invoice/InvoiceServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/invoice/InvoiceServiceImpl.java deleted file mode 100644 index 77c0323f1..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/invoice/InvoiceServiceImpl.java +++ /dev/null @@ -1,412 +0,0 @@ -package com.cf.imes.module.executor.service.funds.invoice; - - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.Header; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.cf.imes.framework.common.exception.ServiceException; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.Assert.AssertUtils; -import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; -import com.cf.imes.framework.common.util.json.JsonUtils; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.mybatis.core.query.QueryWrapperX; -import com.cf.imes.framework.security.core.LoginUser; -import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; -import com.cf.imes.module.executor.controller.admin.funds.invoice.vo.*; -import com.cf.imes.module.executor.dal.dataobject.funds.balancedetails.IncomeExpenseDetailsDO; -import com.cf.imes.module.executor.dal.dataobject.funds.invoice.InvoiceRecordsDO; -import com.cf.imes.module.executor.dal.dataobject.funds.purchase.PurchaseRecordDO; -import com.cf.imes.module.executor.dal.mysql.funds.balancedetails.IncomeExpenseDetailsMapper; -import com.cf.imes.module.executor.dal.mysql.funds.invoice.InvoiceRecordsMapper; -import com.cf.imes.module.executor.dal.mysql.funds.purchase.PurchaseRecordMapper; -import com.cf.imes.module.executor.enums.amount.InvoiceStatusEnum; -import com.cf.imes.module.executor.enums.amount.TradeTypeEnum; -import com.cf.imes.module.system.api.funds.SystemFundsApi; -import com.cf.imes.module.system.api.funds.dto.InvoiceTitleInfoDTO; -import com.cf.imes.module.system.api.organ.OrganApi; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import java.io.*; -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Stream; - -import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.framework.common.util.json.JsonUtils.*; -import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; - -/** - * @author 发票管理接口 实现类 - */ -@Slf4j -@Service -public class InvoiceServiceImpl implements InvoiceService{ - - - @Resource - private PurchaseRecordMapper purchaseRecordMapper; - - @Resource - private IncomeExpenseDetailsMapper incomeExpenseDetailsMapper; - - @Resource - private InvoiceRecordsMapper invoiceRecordsMapper; - - - @Resource - private SystemFundsApi systemFundsApi; - - @Resource - private OrganApi organApi; - - - @Resource - private InvoiceFilePath invoiceFilePath; - - - - private static final String UTF8_CHARSET = CharsetUtil.UTF_8; - private static final String ATTACHMENT_PREFIX = "attachment; filename="; - - - - - - @Override - public InvoiceAmountRespVO getInvoiceAmount(Long organId) { - - InvoiceAmountRespVO invoiceAmountRespVO = purchaseRecordMapper.selectOrganInvoice(organId); - - BigDecimal invoiceableAmount = systemFundsApi.getOrganAmount(organId).getCheckedData().getInvoiceableAmount(); - - return invoiceAmountRespVO.setInvocable(invoiceableAmount); - - } - - - - - - @Override - public PageResult getInvoiceDetails(InvoiceDetailsPageReqVO pageReqVO) { - - PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - - List invoiceStatus = new ArrayList<>(); - invoiceStatus.add(InvoiceStatusEnum.INVOICABLE.getStatus()); - invoiceStatus.add(InvoiceStatusEnum.INVOICINGFAILED.getStatus()); - - QueryWrapperX queryWrapperX = new QueryWrapperX<>(); - - pageReqVO.setCreateTime(LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime())); - queryWrapperX - .eq("ied.organId",getUserOrganId()) - .eq("ied.deleted",false) - .eq("ied.trade_type", TradeTypeEnum.EXPENSES.getType()) - .in("pr.is_invocing", invoiceStatus) - .betweenIfPresent("ied.create_time",pageReqVO.getCreateTime()) - .betweenIfPresent("ied.cash_amount_change",pageReqVO.getAmount()); - - IPage respVOIPage = incomeExpenseDetailsMapper.selectOrganInvoicable(page, queryWrapperX); - - List records = respVOIPage.getRecords(); - if (CollUtil.isEmpty(records)) { - return new PageResult<>(); - } - - return new PageResult<>(records, respVOIPage.getTotal()); - - } - - - - - - - @Override - public PageResult getInvoiceRecords(InvoiceDetailsPageReqVO pageReqVO) { - - pageReqVO.setCreateTime(LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime())); - pageReqVO.setInvoiceTime(LocalDateTimeUtils.generateTimeSection(pageReqVO.getInvoiceTime())); - - PageResult pageResult = invoiceRecordsMapper.selectInvoiceRecordsPage(pageReqVO); - List resultList = pageResult.getList(); - - if(CollUtil.isEmpty(resultList)){ - return new PageResult<>(); - } - - List recordsRespVOS = BeanUtils.toBean(resultList, InvoiceRecordsRespVO.class); - - return new PageResult<>(recordsRespVOS, pageResult.getTotal()); - - - } - - - - - - @Override - public void insetInvoiceRecords(InvoiceRecordsReqVO reqVO) { - - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); - assert loginUser != null; - - String organName = organApi.getOrganDetails(loginUser.getOrganId()).getCheckedData().getName(); - - InvoiceTitleInfoDTO titleInfoDTO = systemFundsApi.getInvoiceTitle(reqVO.getInvoiceTitleId()).getCheckedData(); - - invoiceRecordsMapper.insert(InvoiceRecordsDO.builder() - .userId(loginUser.getId()) - .organName(organName) - .purchaseIds(JsonUtils.toJsonString(reqVO.getPurchaseRecordId())) - .invoiceAmount(reqVO.getInvoiceAmount()) - .invoiceTitleId(reqVO.getInvoiceTitleId()) - .invoiceTitleInfo(zipString(toJsonString(titleInfoDTO))) - .status(InvoiceStatusEnum.PENDINGINVOICING.getStatus()) - .build()); - - - // 更新购买记录表的发票状态 - purchaseRecordMapper.update(new LambdaUpdateWrapper() - .eq(PurchaseRecordDO::getOrganId, loginUser.getOrganId()) - .eq(PurchaseRecordDO::getDeleted,false) - .in(PurchaseRecordDO::getId,reqVO.getPurchaseRecordId()) - .set(PurchaseRecordDO::getIsInvocing, InvoiceStatusEnum.PENDINGINVOICING.getStatus())); - - - // 减少组织余额的可开票的金额 - systemFundsApi.reduceOrganAmount(loginUser.getOrganId(),reqVO.getInvoiceAmount()); - - - } - - - - - @Override - public InvoiceDetailsRespVO getInvoiceIncome(Long invoiceId) { - - InvoiceRecordsDO invoiceRecordsDO = invoiceRecordsMapper.selectById(invoiceId); - - AssertUtils.notEmpty(invoiceRecordsDO,INVOICE_NO_EXIST); - - String purchaseIds = Optional.ofNullable(invoiceRecordsDO.getPurchaseIds()).orElse("[]"); - - List purchaseIdList = JSON.parseArray(purchaseIds).toJavaList(Long.class).stream().distinct().toList(); - - List invoicePurchaseRecords = purchaseRecordMapper.selectPurchaseRecord(purchaseIdList, getUserOrganId()); - - InvoiceTitleInfo invoiceTitleInfo = parseObject(unzipString(invoiceRecordsDO.getInvoiceTitleInfo()), InvoiceTitleInfo.class); - - return InvoiceDetailsRespVO.builder() - .invoicePurchaseRecords(invoicePurchaseRecords) - .invoiceTitleInfo(invoiceTitleInfo) - .build(); - - } - - - - - - @Override - public void invoicing(InvoiceInvoicingReqVO reqVO) { - - InvoiceRecordsDO invoiceRecordsDO = validateInvoiceExists(reqVO.getId()); - - if(invoiceRecordsDO.getStatus().equals(InvoiceStatusEnum.INVOICINGFAILED.getStatus())){ - throw exception(THIS_INVOICE_IS_FAIL); - } - - -// if(invoiceRecordsDO.getStatus().equals(InvoiceStatusEnum.INVOICINGSUCCESSFUL.getStatus())){ -// throw exception(THIS_INVOICE_IS_SUCCESS); -// } - - - String purchaseIds = Optional.ofNullable(invoiceRecordsDO.getPurchaseIds()).orElse("[]"); - - List purchaseIdList = JSON.parseArray(purchaseIds).toJavaList(Long.class).stream().distinct().toList(); - - List purchaseRecordDOS = validatePurchaseRecordExists(purchaseIdList); - - - if(Boolean.TRUE.equals(reqVO.getIsInvoicing())){ - - invoiceRecordsDO.setStatus(InvoiceStatusEnum.INVOICINGSUCCESSFUL.getStatus()); - invoiceRecordsDO.setRemark(reqVO.getRemark()); - - purchaseRecordDOS.forEach(f->f.setIsInvocing(InvoiceStatusEnum.INVOICINGSUCCESSFUL.getStatus())); - - }else { - - // 增加组织余额可开票的金额 - systemFundsApi.addOrganAmount(invoiceRecordsDO.getOrganId(),invoiceRecordsDO.getInvoiceAmount()); - - invoiceRecordsDO.setStatus(InvoiceStatusEnum.INVOICINGFAILED.getStatus()); - String remark = Optional.ofNullable(reqVO.getRemark()).orElseThrow(() -> new ServiceException(INVOICING_REJECT_REASON)); - invoiceRecordsDO.setRemark(remark); - - purchaseRecordDOS.forEach(f->f.setIsInvocing(InvoiceStatusEnum.INVOICABLE.getStatus())); - - } - - - invoiceRecordsDO.setInvoiceAttachmentPath(reqVO.getInvoiceAttachmentPath()); - invoiceRecordsDO.setInvoiceNo(reqVO.getInvoiceNo()); - - invoiceRecordsMapper.updateById(invoiceRecordsDO); - - purchaseRecordMapper.updateBatch(purchaseRecordDOS); - - } - - - - - - @Override - public void uploadInvoice(MultipartFile file, Long invoiceId) { - - AssertUtils.notEmpty(file,INVOICE_FILE_IS_NULL); - - // 生成存储目录 - Path invoiceDir = Paths.get(invoiceFilePath.getFilePath(),String.valueOf(invoiceId)); - if (!Files.exists(invoiceDir)) { - try { - Files.createDirectories(invoiceDir); - } catch (IOException e) { - log.error("发票附件目录创建失败" + e.getMessage()); - throw exception(INVOICE_FILE_UPLOAD_FAILED); - } - } - - - // 删除旧文件（确保目录中只有一个文件） - try (Stream files = Files.list(invoiceDir)) { - files.forEach(existingFile -> { - try { - Files.delete(existingFile); - } catch (IOException e) { - log.error("发票附件旧文件删除失败：" + e.getMessage()); - } - }); - } catch (IOException e) { - log.error("发票附件旧文件删除失败: " + e.getMessage()); - throw exception(INVOICE_FILE_UPLOAD_FAILED); - } - - // 保存新文件 - String fileName = Objects.requireNonNull(file.getOriginalFilename()); - Path filePath = invoiceDir.resolve(fileName); - - try (InputStream inputStream = file.getInputStream()) { - Files.copy(inputStream, filePath, StandardCopyOption.REPLACE_EXISTING); - } catch (IOException e) { - log.error("发票附件上传失败: " + e.getMessage()); - throw exception(INVOICE_FILE_UPLOAD_FAILED); - } - - } - - - - - - @Override - public void downloadInvoice(Long invoiceId, HttpServletResponse response) { - - Path invoiceDir = Paths.get(invoiceFilePath.getFilePath(), String.valueOf(invoiceId)); - - if (!Files.exists(invoiceDir)) { - throw exception(INVOICE_FILE_IS_NULL_NOT_DOWNLOAD); - } - - - // 获取目录中的文件 - File[] files = invoiceDir.toFile().listFiles(); - if (files == null || files.length == 0) { - throw exception(INVOICE_FILE_IS_NULL_NOT_DOWNLOAD); - } - - - // 取第一个文件 - File file = files[0]; - - try (InputStream inputStream = new FileInputStream(file); - OutputStream outputStream = response.getOutputStream()) { - - response.setCharacterEncoding(UTF8_CHARSET); - response.setContentType("application/octet-stream; charset=UTF-8"); - response.setHeader(Header.CONTENT_DISPOSITION.getValue(), ATTACHMENT_PREFIX + URLEncoder.encode(file.getName(), UTF8_CHARSET)); - response.setContentLengthLong(file.length()); - - byte[] buffer = new byte[8192]; - int bytesRead; - while ((bytesRead = inputStream.read(buffer)) != -1) { - outputStream.write(buffer, 0, bytesRead); - } - outputStream.flush(); - - } catch (IOException e) { - log.error("发票附件下载异常："+ e.getMessage()); - throw exception(INVOICE_FILE_DATA_ERROR); - } - - } - - - - - - - private InvoiceRecordsDO validateInvoiceExists(Long invoiceId) { - - InvoiceRecordsDO invoiceRecordsDO = invoiceRecordsMapper.selectById(invoiceId); - - if (ObjectUtil.isNull(invoiceRecordsDO)) { - throw exception(INVOICE_NO_EXIST); - } - - return invoiceRecordsDO; - - } - - - - private List validatePurchaseRecordExists(List purchaseId) { - - List purchaseRecordDOS = purchaseRecordMapper.selectBatchIds(purchaseId); - - if (ObjectUtil.isNull(purchaseRecordDOS)) { - throw exception(PURCHASE_RECORD_NO_EXIST); - } - - return purchaseRecordDOS; - - } - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/purchase/PurchaseService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/purchase/PurchaseService.java deleted file mode 100644 index 2dc23e0dc..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/purchase/PurchaseService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cf.imes.module.executor.service.funds.purchase; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.executor.controller.admin.funds.purchase.vo.PurchaseRecordPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.purchase.vo.PurchaseRecordRespVO; - -/** - * @author 软件购买接口 - */ -public interface PurchaseService { - - PageResult getPurchaseRecord(PurchaseRecordPageReqVO pageReqVO); - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/purchase/PurchaseServiceImpl.java deleted file mode 100644 index 761eead76..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/funds/purchase/PurchaseServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cf.imes.module.executor.service.funds.purchase; - - -import cn.hutool.core.collection.CollUtil; -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.module.executor.controller.admin.funds.purchase.vo.PurchaseRecordPageReqVO; -import com.cf.imes.module.executor.controller.admin.funds.purchase.vo.PurchaseRecordRespVO; -import com.cf.imes.module.executor.dal.dataobject.funds.purchase.PurchaseRecordDO; -import com.cf.imes.module.executor.dal.mysql.funds.purchase.PurchaseRecordMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import jakarta.annotation.Resource; -import java.util.List; - -/** - * @author 软件购买接口 实现类 - */ -@Slf4j -@Service -public class PurchaseServiceImpl implements PurchaseService{ - - - @Resource - private PurchaseRecordMapper purchaseRecordMapper; - - - - - - @Override - public PageResult getPurchaseRecord(PurchaseRecordPageReqVO pageReqVO) { - - - pageReqVO.setCreateTime(LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime())); - - PageResult pageResult = purchaseRecordMapper.selectPage(pageReqVO); - List resultList = pageResult.getList(); - - if(CollUtil.isEmpty(resultList)){ - return new PageResult<>(); - } - - List respVOS = BeanUtils.toBean(resultList, PurchaseRecordRespVO.class); - - return new PageResult<>(respVOS, pageResult.getTotal()); - } - - - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/balancedetails/IncomeExpenseDetailsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/balancedetails/IncomeExpenseDetailsMapper.xml deleted file mode 100644 index 37cfbaa6e..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/balancedetails/IncomeExpenseDetailsMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml deleted file mode 100644 index 1192482e4..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/invoice/InvoiceRecordsMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/purchase/PurchaseRecordMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/purchase/PurchaseRecordMapper.xml deleted file mode 100644 index ea7256822..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/funds/purchase/PurchaseRecordMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/SystemFundsApi.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/SystemFundsApi.java deleted file mode 100644 index 2e411fc50..000000000 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/SystemFundsApi.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cf.imes.module.system.api.funds; - - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.module.system.api.funds.dto.InvoiceTitleInfoDTO; -import com.cf.imes.module.system.api.funds.dto.OrganAmountDTO; -import com.cf.imes.module.system.enums.ApiConstants; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.math.BigDecimal; - -/** - * @author 资金管理feign接口 - */ -@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory = -@Tag(name = "RPC 服务 - 资金管理") -public interface SystemFundsApi { - - - String PREFIX = ApiConstants.PREFIX + "/funds"; - - - @GetMapping(PREFIX + "/amount/reduce") - @Operation(summary = "减少组织可开票的金额") - CommonResult reduceOrganAmount(@RequestParam("organId") Long organId,@RequestParam("invoiceAmount") BigDecimal invoiceAmount); - - - @GetMapping(PREFIX + "/amount/add") - @Operation(summary = "增加组织可开票的金额") - CommonResult addOrganAmount(@RequestParam("organId") Long organId,@RequestParam("invoiceAmount") BigDecimal invoiceAmount); - - - @GetMapping(PREFIX + "/amount/organ") - @Operation(summary = "获取组织的资金信息") - CommonResult getOrganAmount(@RequestParam("organId") Long organId); - - - @GetMapping(PREFIX + "/invoice/title") - @Operation(summary = "获取发票的抬头信息") - CommonResult getInvoiceTitle(@RequestParam("invoiceTitleId") Long invoiceTitleId); - - -} diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/dto/InvoiceTitleInfoDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/dto/InvoiceTitleInfoDTO.java deleted file mode 100644 index 9b9df8aaa..000000000 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/dto/InvoiceTitleInfoDTO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cf.imes.module.system.api.funds.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - - -@Schema(description = "RPC 服务 - 发票的抬头信息") -@Data -public class InvoiceTitleInfoDTO { - - - @Schema(description = "抬头ID") - private Long id; - - - @Schema(description = "组织ID") - private Long organId; - - - @Schema(description = "发票抬头") - private String invoiceTitle; - - - @Schema(description = "开具类型") - private Integer issueType; - - - @Schema(description = "发票类型") - private Integer invoiceType; - - - @Schema(description = "纳税人识别号") - private String taxpayerId; - - - @Schema(description = "开户银行名称") - private String bankName; - - - @Schema(description = "开户银行账号") - private String bankAccount; - - - @Schema(description = "注册场所地址") - private String registeredAddress; - - - @Schema(description = "注册固定电话") - private String fixedPhone; - - - @Schema(description = "邮箱") - private String email; - - -} - diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/dto/OrganAmountDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/dto/OrganAmountDTO.java deleted file mode 100644 index b2f67e969..000000000 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/funds/dto/OrganAmountDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cf.imes.module.system.api.funds.dto; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; - -@Schema(description = "RPC 服务 - 组织的资金信息") -@Data -public class OrganAmountDTO { - - - @Schema(description = "主键") - private Long id; - - - @Schema(description = "组织ID") - private Long organId; - - - @Schema(description = "现金金额") - private BigDecimal amount; - - - @Schema(description = "赠送金额") - private BigDecimal giftAmount; - - - @Schema(description = "货币类型") - private Integer currency; - - - @Schema(description = "货币单位") - private String currencyUnit; - - - @Schema(description = "可开票金额") - private BigDecimal invoiceableAmount; - - - -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/funds/SystemFundsApiImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/funds/SystemFundsApiImpl.java deleted file mode 100644 index d37552a99..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/funds/SystemFundsApiImpl.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.cf.imes.module.system.api.funds; - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.util.Assert.AssertUtils; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.module.system.api.funds.dto.InvoiceTitleInfoDTO; -import com.cf.imes.module.system.api.funds.dto.OrganAmountDTO; -import com.cf.imes.module.system.dal.dataobject.funds.invoice.InvoiceTitleInfoDO; -import com.cf.imes.module.system.dal.dataobject.funds.organamount.OrganAmountDO; -import com.cf.imes.module.system.dal.mysql.funds.invoice.InvoiceTitleInfoMapper; -import com.cf.imes.module.system.dal.mysql.funds.organamount.OrganAmountMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; -import java.math.BigDecimal; - -import static com.cf.imes.module.system.enums.ErrorCodeConstants.INVOICE_TITLE_NO_EXIST; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.ORGAN_AMOUNT_NO_EXIST; - - -/** - * @author 资金管理feign实现类 - */ -@RestController -@Validated -@Slf4j -public class SystemFundsApiImpl implements SystemFundsApi { - - @Resource - private OrganAmountMapper organAmountMapper; - - - @Resource - private InvoiceTitleInfoMapper invoiceTitleInfoMapper; - - - @Override - public CommonResult reduceOrganAmount(Long organId, BigDecimal invoiceAmount) { - - OrganAmountDO organAmountDO = validateOrganAmountExists(organId); - - BigDecimal invoiceableAmount = organAmountDO.getInvoiceableAmount().subtract(invoiceAmount); - - if(invoiceableAmount.signum() < 0){ - invoiceableAmount = BigDecimal.valueOf(0); - } - - - organAmountDO.setInvoiceableAmount(invoiceableAmount); - organAmountMapper.updateById(organAmountDO); - - return CommonResult.success(Boolean.TRUE); - - } - - - - - @Override - public CommonResult addOrganAmount(Long organId, BigDecimal invoiceAmount) { - - OrganAmountDO organAmountDO = validateOrganAmountExists(organId); - - BigDecimal invoiceableAmount = organAmountDO.getInvoiceableAmount().add(invoiceAmount); - - - organAmountDO.setInvoiceableAmount(invoiceableAmount); - organAmountMapper.updateById(organAmountDO); - - return CommonResult.success(Boolean.TRUE); - - } - - @Override - public CommonResult getOrganAmount(Long organId) { - - return CommonResult.success(BeanUtils.toBean(validateOrganAmountExists(organId),OrganAmountDTO.class)); - - } - - - @Override - public CommonResult getInvoiceTitle(Long invoiceTitleId) { - - InvoiceTitleInfoDO invoiceTitleInfoDO = invoiceTitleInfoMapper.selectById(invoiceTitleId); - - AssertUtils.notEmpty(invoiceTitleInfoDO,INVOICE_TITLE_NO_EXIST); - - return CommonResult.success(BeanUtils.toBean(invoiceTitleInfoDO,InvoiceTitleInfoDTO.class)); - - } - - - - - - private OrganAmountDO validateOrganAmountExists(Long organId) { - - OrganAmountDO organAmountDO = organAmountMapper.selectOne(new LambdaUpdateWrapper() - .eq(OrganAmountDO::getOrganId, organId) - .eq(OrganAmountDO::getDeleted, false)); - - AssertUtils.notEmpty(organAmountDO,ORGAN_AMOUNT_NO_EXIST); - - return organAmountDO; - - } - - - - -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/organamount/OrganAmountDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/organamount/OrganAmountDO.java index 1f4b1c830..246515955 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/organamount/OrganAmountDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/organamount/OrganAmountDO.java @@ -56,12 +56,6 @@ public class OrganAmountDO extends BaseDO { */ private String currencyUnit; - - /** - * 可开票金额 - */ - private BigDecimal invoiceableAmount; - /** * 版本号 */ diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/rpc/config/RpcConfiguration.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/rpc/config/RpcConfiguration.java index e2f0de47c..4f10eaa34 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/rpc/config/RpcConfiguration.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/rpc/config/RpcConfiguration.java @@ -1,7 +1,6 @@ package com.cf.imes.module.system.framework.rpc.config; import com.cf.imes.module.executor.api.customplateno.OrderCustomPlateNoApi; -import com.cf.imes.module.executor.api.funds.ExecutorFundsApi; import com.cf.imes.module.executor.api.orderProcess.OrderProcessApi; import com.cf.imes.module.executor.api.plan.OrderPlanApi; import com.cf.imes.module.infra.api.file.FileApi; @@ -10,6 +9,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) -@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, OrderProcessApi.class, OrderPlanApi.class, OrderCustomPlateNoApi.class, ExecutorFundsApi.class}) +@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, OrderProcessApi.class, OrderPlanApi.class, OrderCustomPlateNoApi.class}) public class RpcConfiguration { }