修改结算单列表接口

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

+package com.clx.performance.enums.settle;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum SettlementDriverEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum InvoiceType {
+        ONLINE(1, "网运单"),
+        ORDINARY(2, "普通单");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<InvoiceType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(InvoiceType::getMsg).orElse(null);
+        }
+    }
+
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        WAIT_SETTLEMENT(1, "待结算"),
+        SETTLED(2, "已结算"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Status> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Status::getMsg).orElse(null);
+        }
+    }
+
+
+
+}

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

+package com.clx.performance.enums.settle;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum SettlementPlatformEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum Platform {
+        MSL(1, "马上来"),
+        WY(2, "网运平台");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Platform> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Platform::getMsg).orElse(null);
+        }
+    }
+
+
+
+
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/driver/PageCarrierSettlementDriverParam.java

@@ -13,10 +13,6 @@ import lombok.ToString;
 @ToString
 public class PageCarrierSettlementDriverParam extends PageParam {
 
-
-    @ApiModelProperty(value="订单编号",example = "201457878")
-    private String orderNo;
-
     @ApiModelProperty(value="货单编号",example = "201457878")
     private String orderGoodsNo;
 
@@ -26,6 +22,9 @@ public class PageCarrierSettlementDriverParam extends PageParam {
     @ApiModelProperty(value="车主编码",example = "201457878")
     private Long driverUserNo;
 
+    @ApiModelProperty(value="状态 1:待结算  2:已结算",example = "10")
+    private String status;
+
 
 
 

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

@@ -63,6 +63,10 @@ public class CarrierPageSettlementDriverVO {
     private BigDecimal settlementFreight;
     @ApiModelProperty(value = "创建时间")
     private String createTime;
+    @ApiModelProperty(value = "结算平台 1：马上来  2：网运平台")
+    private String settlementPlatform;
+
+
 
 
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDaoImpl.java

@@ -34,12 +34,13 @@ public class SettlementDriverDaoImpl extends BaseDaoImpl<SettlementDriverMapper,
         if(StringUtils.isNotBlank(param.getOrderGoodsNo())){
             query.eq(SettlementDriver :: getOrderGoodsNo,param.getOrderGoodsNo());
         }
-        if(StringUtils.isNotBlank(param.getOrderNo())){
-            query.eq(SettlementDriver :: getOrderNo,param.getOrderNo());
+        if(Objects.nonNull(param.getStatus())){
+            query.eq(SettlementDriver :: getStatus,param.getStatus());
         }
         if(Objects.nonNull(param.getDriverUserNo())){
-            query.eq(SettlementDriver :: getOrderNo,param.getOrderNo());
+            query.eq(SettlementDriver :: getDriverUserNo,param.getDriverUserNo());
         }
+
         query.orderByDesc(SettlementDriver :: getCreateTime);
         return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
     }