结算单状态变更

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.owner.*;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.vo.pc.carrier.settle.*;
+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;
@@ -121,5 +122,11 @@ public class CarrierSettlementOwnerController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "获取结算平台收款账号",notes = "<br>By:李瑞新")
+    @GetMapping("/getSettlementPlatformAccount")
+    public Result<SettlementPlatformAccountVO> getSettlementPlatformAccount(@NotNull(message = "结算单号不能为空") String settlementNo) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementPlatformAccount(settlementNo));
+    }
+
 
 }

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

@@ -140,6 +140,30 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         return vo;
     }
 
+
+    @Override
+    public SettlementPlatformAccountVO getCarrierSettlementPlatformAccount(String settlementNo){
+        //平台账号
+        SettlementPlatformAccount platformAccount = settlementPlatformAccountDao.getSettlementPlatformAccount();
+        //返回对象
+        SettlementPlatformAccountVO vo = new SettlementPlatformAccountVO();
+        if(Objects.nonNull(platformAccount)){
+            vo.setPaymentBankCardNo(platformAccount.getBankCardNo());
+            vo.setPaymentBankName(platformAccount.getBankName());
+        }
+
+        //货主账号
+        SettlementOwner settlementOwner = settlementOwnerDao.selectBySettlementNo(settlementNo).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;
+    }
+
+
     @Override
     public void updatePaymentSettlement(OwnerPaymentSettlementParam param) {
         //结算单详情

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

@@ -20,6 +20,8 @@ public interface SettlementOwnerService {
 
     SettlementPlatformAccountVO getSettlementPlatformAccount();
 
+    SettlementPlatformAccountVO getCarrierSettlementPlatformAccount(String settlementNo);
+
     void updatePaymentSettlement(OwnerPaymentSettlementParam param);
 
     void updatePaymentConfirmSettlement(Integer id);