增加开票公司信息

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerSettlementOwnerController.java

@@ -64,8 +64,8 @@ public class OwnerSettlementOwnerController {
 
     @ApiOperation(value = "获取违约结算平台收款账号",notes = "<br>By:姜文业")
     @GetMapping("/getBreakSettlementPlatformAccount")
-    public Result<SettlementPlatformAccountVO> getBreakSettlementPlatformAccount() {
-        return Result.ok(settlementOwnerService.getBreakSettlementPlatformAccount());
+    public Result<SettlementPlatformAccountVO> getBreakSettlementPlatformAccount(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(settlementOwnerService.getBreakSettlementPlatformAccount(id));
     }
 
     @ApiOperation(value = "付款接口",notes = "<br>By:李瑞新")

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java

@@ -396,13 +396,14 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         }*/
         //货主账号
         BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(settlementOwner.getOrderNo());
 
         List<CarrierPagePlatformAccountConfigVO> configs =
                 platformAccountConfigService.getPlatformAccountConfigByType(
                         PlatformAccountConfigEnum.BusinessType.BREAK.getCode(),
                         PlatformAccountConfigEnum.OwnerType.COMPANY.getCode(),
                         null,
-                        null,
+                        orderInfoFeign.getInvoicingCompanyId(),
                         PlatformAccountConfigEnum.ConfigRange.PAY.getCode());
         if(CollectionUtils.isEmpty(configs)){
             throw new ServiceSystemException(PerformanceResultEnum.PLATFORM_ACCOUNT_CONFIG_IS_NULL);

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -3,7 +3,10 @@ package com.clx.performance.service.impl.settle;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.feign.OrderFeign;
+import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.NetworkSyncComponent;
+import com.clx.performance.dao.breakcontract.BreakContractSettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementLogDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
@@ -13,6 +16,7 @@ import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.PlatformAccountConfigEnum;
 import com.clx.performance.enums.settle.*;
+import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
 import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
@@ -79,6 +83,8 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
     private final SettlementMqHandlerService settlementMqHandlerService;
 
     private final PlatformAccountConfigService platformAccountConfigService;
+    private final OrderFeign orderFeign;
+    private final BreakContractSettlementOwnerDao breakContractSettlementOwnerDao;
 
 
 
@@ -178,7 +184,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
     }
 
     @Override
-    public SettlementPlatformAccountVO getBreakSettlementPlatformAccount() {
+    public SettlementPlatformAccountVO getBreakSettlementPlatformAccount(Integer id) {
 
         //平台账号
         //SettlementPlatformAccount platformAccount = settlementPlatformAccountDao.getSettlementPlatformAccount();
@@ -190,12 +196,15 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             vo.setPayeeBankName(platformAccount.getBankName());
         }*/
 
+        BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(settlementOwner.getOrderNo());
+
         List<CarrierPagePlatformAccountConfigVO> configs =
                 platformAccountConfigService.getPlatformAccountConfigByType(
                         PlatformAccountConfigEnum.BusinessType.BREAK.getCode(),
                         PlatformAccountConfigEnum.OwnerType.COMPANY.getCode(),
                         null,
-                        null,
+                        orderInfoFeign.getInvoicingCompanyId(),
                         PlatformAccountConfigEnum.ConfigRange.COLLECTION.getCode());
         if(CollectionUtils.isEmpty(configs)){
             throw new ServiceSystemException(PerformanceResultEnum.PLATFORM_ACCOUNT_CONFIG_IS_NULL);

performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerService.java

@@ -21,7 +21,7 @@ public interface SettlementOwnerService {
 
     SettlementPlatformAccountVO getSettlementPlatformAccount();
 
-    SettlementPlatformAccountVO getBreakSettlementPlatformAccount();
+    SettlementPlatformAccountVO getBreakSettlementPlatformAccount(Integer id);
 
     SettlementPlatformAccountVO getCarrierSettlementPlatformAccount(String settlementNo);