From 699bf330832b958f0c49e4786b7bc994df99cf09 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Apr 2022 14:30:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E4=BD=8D=E7=BD=AE=E5=90=8E=EF=BC=8C=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=AC=BE=E9=A1=B9=E4=BF=9D=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-base/anrui-base-biz/pom.xml | 6 ++ .../com/yxt/anrui/base/BaseApplication.java | 2 +- .../commoncontract/CommonContractRest.java | 58 +++++++++---------- .../FinAccountCategoryFeign.java | 4 +- .../FinAccountingDimensionFeign.java | 4 +- .../FinAccountingElementsFeign.java | 4 +- .../FinGinvoiceapplyFeign.java | 4 +- .../FinGinvoiceapplyInfoFeign.java | 4 +- 8 files changed, 46 insertions(+), 40 deletions(-) diff --git a/anrui-base/anrui-base-biz/pom.xml b/anrui-base/anrui-base-biz/pom.xml index 02c04aa8a3..27fbe6d277 100644 --- a/anrui-base/anrui-base-biz/pom.xml +++ b/anrui-base/anrui-base-biz/pom.xml @@ -89,6 +89,12 @@ 4.0.1 compile + + com.yxt.anrui.fin + anrui-fin-api + 0.0.1 + compile + diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java index ce0c8d0dc5..436a4764b3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java @@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.common.base.config", "com.yxt.anrui.base" }) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin"}) public class BaseApplication { public static void main(String[] args) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 9ac4bcae74..4f3e90b8e2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -15,8 +15,8 @@ import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo; import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.StringUtils; @@ -73,7 +73,7 @@ public class CommonContractRest implements CommonContractFeign { @Autowired private FileUploadComponent fileUploadComponent; @Autowired - private BusUncollectedReceivablesDetailedFeign busUncollectedReceivablesDetailedFeign; + private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign; @Autowired private BusOrderFeign busOrderFeign; @@ -141,32 +141,32 @@ public class CommonContractRest implements CommonContractFeign { String deposit = busOrderDepositVo.getDeposit(); int fictitious = 1; for (BusOrderVehicleVo vehicleDto : vehicleDtos) { - BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDepositDto = new BusUncollectedReceivablesDetailedDto(); - busUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); - busUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金"); - busUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit); - busUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo()); - busUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid()); - busUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName()); - busUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid()); - busUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile()); - busUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid()); - busUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid()); - busUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName()); - busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedDepositDto); - BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedSingleDto = new BusUncollectedReceivablesDetailedDto(); - busUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); - busUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款"); - busUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price)); - busUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo()); - busUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid()); - busUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName()); - busUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid()); - busUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile()); - busUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid()); - busUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid()); - busUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName()); - busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedSingleDto); + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDepositDto = new FinUncollectedReceivablesDetailedDto(); + finUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); + finUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金"); + finUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit); + finUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo()); + finUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid()); + finUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName()); + finUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid()); + finUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile()); + finUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid()); + finUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid()); + finUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName()); + finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDepositDto); + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedSingleDto = new FinUncollectedReceivablesDetailedDto(); + finUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); + finUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款"); + finUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price)); + finUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo()); + finUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid()); + finUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName()); + finUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid()); + finUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile()); + finUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid()); + finUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid()); + finUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName()); + finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedSingleDto); } return rb.success().setData(commonContract.getSid()); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java index 3117ec3243..7dfaf6c137 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = "对应金蝶系统的科目类别表") @FeignClient( - contextId = "anrui_fin-FinAccountCategory", - name = "anrui_fin", + contextId = "anrui-fin-FinAccountCategory", + name = "anrui-fin", path = "finaccountcategory", fallback = FinAccountCategoryFeignFallback.class) public interface FinAccountCategoryFeign { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java index 5c761395c0..3da314f6be 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = " 对应金蝶系统的核算维度表") @FeignClient( - contextId = "anrui_fin-FinAccountingDimension", - name = "anrui_fin", + contextId = "anrui-fin-FinAccountingDimension", + name = "anrui-fin", path = "finaccountingdimension", fallback = FinAccountingDimensionFeignFallback.class) public interface FinAccountingDimensionFeign { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java index b08426407a..97c147f3cd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = "对应金蝶系统的会计要素表") @FeignClient( - contextId = "anrui_fin-FinAccountingElements", - name = "anrui_fin", + contextId = "anrui-fin-FinAccountingElements", + name = "anrui-fin", path = "finaccountingelements", fallback = FinAccountingElementsFeignFallback.class) public interface FinAccountingElementsFeign { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java index f6e1bd8b9e..2faad01c6c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java @@ -26,8 +26,8 @@ import java.util.List; */ @Api(tags = "公司开票申请单") @FeignClient( - contextId = "anrui_fin-FinGinvoiceapply", - name = "anrui_fin", + contextId = "anrui-fin-FinGinvoiceapply", + name = "anrui-fin", path = "v1/finginvoiceapply", fallback = FinGinvoiceapplyFeignFallback.class) public interface FinGinvoiceapplyFeign { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java index bda0101765..9d5220c305 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java @@ -26,8 +26,8 @@ import java.util.List; */ @Api(tags = "公司开票申请单开票信息") @FeignClient( - contextId = "anrui_fin-FinGinvoiceapplyInfo", - name = "anrui_fin", + contextId = "anrui-fin-FinGinvoiceapplyInfo", + name = "anrui-fin", path = "v1/finginvoiceapplyinfo", fallback = FinGinvoiceapplyInfoFeignFallback.class) public interface FinGinvoiceapplyInfoFeign {