diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java index 37e33b1c..4c1b36bb 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java @@ -73,6 +73,7 @@ public interface ISysClient { String REGION = API_PREFIX + "/region"; String FEE_ITEMS = API_PREFIX + "/fee-items"; String CARGO_TYPES = API_PREFIX + "/cargo-types"; + String INVOICE_ITEMS = API_PREFIX + "/invoice-items"; /** * 获取菜单 @@ -316,4 +317,12 @@ public interface ISysClient { @GetMapping(CARGO_TYPES) R> getCargoTypes(); + /** + * 获取启用的开票项目(含税收分类编码,开票申请推送金蝶按分类+简称匹配取数) + * + * @return 开票项目集合 + */ + @GetMapping(INVOICE_ITEMS) + R> getInvoiceItems(); + } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java index c7598c34..0bfe39a1 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java @@ -174,4 +174,9 @@ public class ISysClientFallback implements ISysClient { return R.fail("获取数据失败"); } + @Override + public R> getInvoiceItems() { + return R.fail("获取数据失败"); + } + } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java index 49c86132..b227c4a8 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java @@ -66,6 +66,7 @@ public class SysClient implements ISysClient { private final IFeeItemService feeItemService; private final ICargoTypeService cargoTypeService; + private final IInvoiceItemService invoiceItemService; @Override @GetMapping(MENU) @@ -231,4 +232,13 @@ public class SysClient implements ISysClient { .orderByAsc(CargoType::getCargoCode))); } + @Override + @GetMapping(INVOICE_ITEMS) + public R> getInvoiceItems() { + return R.data(invoiceItemService.list(Wrappers.lambdaQuery() + .eq(InvoiceItem::getStatus, 1) + .eq(InvoiceItem::getIsDeleted, 0) + .orderByAsc(InvoiceItem::getCategoryName, InvoiceItem::getShortName))); + } + }