增加开票公司信息

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

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

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

@@ -184,18 +184,43 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
     }
 
     @Override
-    public SettlementPlatformAccountVO getBreakSettlementPlatformAccount(Integer id) {
-
-        //平台账号
-        //SettlementPlatformAccount platformAccount = settlementPlatformAccountDao.getSettlementPlatformAccount();
+    public SettlementPlatformAccountVO getSettlementPlatformAccountById(Integer id) {
         //返回对象
         SettlementPlatformAccountVO vo = new SettlementPlatformAccountVO();
-        /*if(Objects.nonNull(platformAccount)){
-            vo.setPayee(platformAccount.getCardHolder());
-            vo.setPayeeBankCardNo(platformAccount.getBankCardNo());
-            vo.setPayeeBankName(platformAccount.getBankName());
-        }*/
+        SettlementOwner settlementOwner = settlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(settlementOwner.getOrderNo());
+
+        List<CarrierPagePlatformAccountConfigVO> configs =
+                platformAccountConfigService.getPlatformAccountConfigByType(
+                        PlatformAccountConfigEnum.BusinessType.SETTLE.getCode(),
+                        PlatformAccountConfigEnum.OwnerType.COMPANY.getCode(),
+                        settlementOwner.getInvoiceType(),
+                        orderInfoFeign.getInvoicingCompanyId(),
+                        PlatformAccountConfigEnum.ConfigRange.COLLECTION.getCode());
+        if(CollectionUtils.isEmpty(configs)){
+            throw new ServiceSystemException(PerformanceResultEnum.PLATFORM_ACCOUNT_CONFIG_IS_NULL);
+        }
+        if(configs.size() > 1){
+            throw new ServiceSystemException(PerformanceResultEnum.PLATFORM_ACCOUNT_CONFIG_MANY);
+        }
+        vo.setPayee(configs.get(0).getCompanyName());
+        vo.setPayeeBankCardNo(configs.get(0).getBankCardNo());
+        vo.setPayeeBankName(configs.get(0).getBankName());
 
+        //当前账号
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        OwnerBindCardVO card = ownerAccountService.getOwnerBindCard(loginUserInfo.getUserNo());
+        if(Objects.nonNull(card)){
+            vo.setPaymentBankCardNo(card.getOwnerBankAccount());
+            vo.setPaymentBankName(card.getOwnerAccountBank());
+        }
+        return vo;
+    }
+
+    @Override
+    public SettlementPlatformAccountVO getBreakSettlementPlatformAccount(Integer id) {
+        //返回对象
+        SettlementPlatformAccountVO vo = new SettlementPlatformAccountVO();
         BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(settlementOwner.getOrderNo());
 

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

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