货主确认付款

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerEnum.java

@@ -53,10 +53,11 @@ public enum SettlementOwnerEnum {
         TO_BE_ACCOUNT(2, "待对账"),
         OWNER_TO_BE_CONFIRMED(3, "待货主确认"),
         SHIPPER_TO_PAYMENT (4, "待货主付款"),
-        PAYMENT_TO_BE_CONFIRMED(5, "付款待确认"),
-        INVOICE_TO_BE_MAILED(6, "待邮寄发票"),
-        PLATFORM_TO_PAYMENT(7, "待平台付款"),
-        COMPLETED(8, "已完结"),
+        PLATFORM_CONFIRMED_OWNER_PAYMENT(5, "平台确认货主付款"),
+        PLATFORM_TO_PAYMENT(6, "待平台付款"),
+        OWNER_CONFIRMED_PLATFORM_PAYMENT(7, "货主确认平台付款"),
+        INVOICE_TO_BE_MAILED(8, "待邮寄发票"),
+        COMPLETED(9, "已完结"),
 
         ;
 

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

@@ -57,4 +57,12 @@ public class OwnerSettlementOwnerController {
     }
 
 
+    @ApiOperation(value = "付款确认接口",notes = "<br>By:李瑞新")
+    @PostMapping("/updatePaymentConfirmSettlement")
+    public Result updatePaymentConfirmSettlement(@RequestBody @Validated OwnerConfirmSettlementParam param) {
+        settlementOwnerService.updatePaymentConfirmSettlement(param.getId());
+        return Result.ok();
+    }
+
+
 }

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

@@ -111,12 +111,30 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         if(!Objects.equals(settlementOwner.getStatus(), SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.SETTLEMENT_ORDER_STATUS_CHANGED);
         }
-        //更新状态为付款待确认
+        //更新状态为平台确认货主付款
         SettlementOwner settlement = SettlementOwner.builder().payee(param.getPayee()).payeeBankCardNo(param.getPayeeBankCardNo())
                 .payeeBankName(param.getPayeeBankName()).paymentBankCardNo(param.getPaymentBankCardNo())
                 .paymentBankName(param.getPaymentBankName()).paymentImg(param.getPaymentImg())
                 .settlementNo(settlementOwner.getSettlementNo())
-                .status(SettlementOwnerEnum.Status.PAYMENT_TO_BE_CONFIRMED.getCode()).build();
+                .status(SettlementOwnerEnum.Status.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode()).build();
         settlementOwnerDao.updatePayment(settlement);
     }
+
+    @Override
+    public void updatePaymentConfirmSettlement(Integer id) {
+
+        //结算单详情
+        SettlementOwner settlementOwner =settlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        //状态判断
+        if(!Objects.equals(settlementOwner.getStatus(), SettlementOwnerEnum.Status.OWNER_CONFIRMED_PLATFORM_PAYMENT.getCode())){
+            throw new ServiceSystemException(PerformanceResultEnum.SETTLEMENT_ORDER_STATUS_CHANGED);
+        }
+        Integer status = SettlementOwnerEnum.Status.INVOICE_TO_BE_MAILED.getCode();//待邮寄发票
+        if(Objects.equals(settlementOwner.getStatus(),SettlementOwnerEnum.InvoiceType.ONLINE.getCode())){//网运单
+            status = SettlementOwnerEnum.Status.COMPLETED.getCode();
+        }
+        //更新状态
+        settlementOwnerDao.updateStatusBySettlementNo(settlementOwner.getSettlementNo(),status);
+
+    }
 }

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

@@ -19,4 +19,6 @@ public interface SettlementOwnerService {
     SettlementPlatformAccountVO getSettlementPlatformAccount();
 
     void updatePaymentSettlement(OwnerPaymentSettlementParam param);
+
+    void updatePaymentConfirmSettlement(Integer id);
 }