上传结算凭证

performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementLogEnum.java

@@ -21,6 +21,7 @@ public enum BreakContractSettlementLogEnum {
         PLATFORM_TO_PAYMENT(6, "平台付款"),
         OWNER_CONFIRMED_PLATFORM_PAYMENT(7, "货主确认付款"),
         COMPLETED(8, "已完结"),
+        CANCEL(9, "已取消"),
 
         ;
 

performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementOwnerEnum.java

@@ -20,6 +20,7 @@ public enum BreakContractSettlementOwnerEnum {
         PLATFORM_TO_PAYMENT(50, "待平台付款"),
         OWNER_CONFIRMED_PLATFORM_PAYMENT(60, "待货主确认付款"),
         COMPLETED(70, "已完结"),
+        CANCEL(80, "已取消"),
 
         ;
 
@@ -36,18 +37,5 @@ public enum BreakContractSettlementOwnerEnum {
     }
 
 
-    @Getter
-    @AllArgsConstructor
-    public enum DeleteStatus {
-        NO(0, "否"),
-        YES(1, "是"),
-
-        ;
-
-        private final Integer code;
-        private final String msg;
-
-    }
-
 
 }

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDaoImpl.java

@@ -27,7 +27,6 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
     @Override
     public IPage<BreakContractSettlementOwner> pageCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param) {
         LambdaQueryWrapper<BreakContractSettlementOwner> query = new LambdaQueryWrapper<>();
-        query.eq(BreakContractSettlementOwner :: getDeleteStatus, BreakContractSettlementOwnerEnum.DeleteStatus.NO.getCode());
         query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractSettlementOwner :: getOrderNo,param.getOrderNo());
         query.eq(StringUtils.isNotBlank(param.getSettlementNo()),BreakContractSettlementOwner ::getSettlementNo ,param.getSettlementNo());
         query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwner :: getBreakContractPartyType,param.getBreakContractPartyType());

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementOwner.java

@@ -96,10 +96,6 @@ public class BreakContractSettlementOwner  implements HasKey<Integer> {
     @ApiModelProperty("操作人名称")
     private String createName;
 
-    @TableField("delete_status")
-    @ApiModelProperty("删除状态 0-否；1-是")
-    private Integer deleteStatus;
-
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;