Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractSettlementOwnerController.java

@@ -5,6 +5,7 @@ import com.clx.performance.param.pc.breakcontract.carrier.*;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
+import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
@@ -88,4 +89,10 @@ public class CarrierBreakContractSettlementOwnerController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "获取结算平台收款账号",notes = "<br>By:李瑞新")
+    @GetMapping("/getSettlementPlatformAccount")
+    public Result<SettlementPlatformAccountVO> getSettlementPlatformAccount(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(breakContractSettlementOwnerService.getCarrierSettlementPlatformAccount(id));
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
 import com.clx.performance.param.pc.breakcontract.carrier.*;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
+import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
 /**
@@ -37,5 +38,7 @@ public interface BreakContractSettlementOwnerService  {
 
     void saveBreakContractSettlementOwner(OrderAdjustTonnageDownParam param);
 
+    SettlementPlatformAccountVO getCarrierSettlementPlatformAccount(Integer id);
+
 
 }

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

@@ -9,13 +9,16 @@ import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.breakcontract.BreakContractOwnerRuleDao;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementLogDao;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementOwnerDao;
+import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.breakcontract.BreakContractOwnerRule;
 import com.clx.performance.model.breakcontract.BreakContractSettlementLog;
 import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
+import com.clx.performance.model.settle.SettlementPlatformAccount;
 import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
 import com.clx.performance.param.pc.breakcontract.carrier.*;
+import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementLogService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.struct.breakcontract.BreakContractSettlementLogStruct;
@@ -28,6 +31,8 @@ import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementLogVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
+import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
+import com.clx.user.vo.pc.owner.OwnerBindCardVO;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
@@ -60,6 +65,8 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     private final BreakContractSettlementLogService breakContractSettlementLogService;
     private final OrderChildDao orderChildDao;
     private final BreakContractOwnerRuleDao breakContractOwnerRuleDao;
+    private final SettlementPlatformAccountDao settlementPlatformAccountDao;
+    private final OwnerAccountService ownerAccountService;
     
 
     @Override
@@ -321,4 +328,25 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
 
 
     }
+
+    @Override
+    public SettlementPlatformAccountVO getCarrierSettlementPlatformAccount(Integer id) {
+        //平台账号
+        SettlementPlatformAccount platformAccount = settlementPlatformAccountDao.getSettlementPlatformAccount();
+        //返回对象
+        SettlementPlatformAccountVO vo = new SettlementPlatformAccountVO();
+        if(Objects.nonNull(platformAccount)){
+            vo.setPaymentBankCardNo(platformAccount.getBankCardNo());
+            vo.setPaymentBankName(platformAccount.getBankName());
+        }
+        //货主账号
+        BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        OwnerBindCardVO card = ownerAccountService.getOwnerBindCard(settlementOwner.getOwnerUserNo());
+        if(Objects.nonNull(card)){
+            vo.setPayee(card.getName());
+            vo.setPayeeBankName(card.getOwnerAccountBank());
+            vo.setPayeeBankCardNo(card.getOwnerBankAccount());
+        }
+        return vo;
+    }
 }