货主结算单详情code-msg

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

@@ -6,9 +6,7 @@ import lombok.Getter;
 import java.util.Arrays;
 import java.util.Optional;
 
-@Getter
-@AllArgsConstructor
-@SuppressWarnings("all")
+
 public enum DriverTruckEnum {
     ;
     @Getter

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+
+public enum SettlementOwnerEnum {
+    ;
+    @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 InvoiceStatus {
+        All_INVOICED(1, "已开票"),
+        PARTIAL_INVOICED(2, "部分开票"),
+        NO_NEED_INVOICE(3, "无需开票");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<InvoiceStatus> 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(InvoiceStatus::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+        TO_BE_OCKED(1, "待锁定"),
+        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, "已完结"),
+        REJECTED(9, "已驳回"),
+
+        ;
+
+        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/TruckDemandEnum.java

@@ -6,9 +6,6 @@ import lombok.Getter;
 import java.util.Arrays;
 import java.util.Optional;
 
-@Getter
-@AllArgsConstructor
-@SuppressWarnings("all")
 public enum TruckDemandEnum {
     ;
     @Getter

performance-api/src/main/java/com/clx/settlement/vo/pc/CarrierSettlementOwnerDetailVO.java

@@ -59,7 +59,10 @@ public class CarrierSettlementOwnerDetailVO {
     private BigDecimal settlementFreight;
 
     @ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "1")
-    private Integer invoiceType;
+    private Integer invoiceTypeCode;
+
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "网运单")
+    private String invoiceTypeMsg;
 
     @ApiModelProperty(value = "开票金额（元）", example = "1.23")
     @MoneyOutConvert
@@ -110,11 +113,17 @@ public class CarrierSettlementOwnerDetailVO {
     @ApiModelProperty(value = "快递编号", example = "SF145787")
     private String expressNo;
 
-    @ApiModelProperty(value = "开票状态", example = "1")
-    private Integer invoiceStatus;
+    @ApiModelProperty(value = "开票状态code 1-已开票 2-部分开票 3-无需开票", example = "1")
+    private Integer invoiceStatusCode;
+
+    @ApiModelProperty(value = "开票状态Msg 1-已开票 2-部分开票 3-无需开票", example = "无需开票")
+    private String invoiceStatusMsg;
+
+    @ApiModelProperty(value = "状态code 1-待锁定,2-待对账,3-待货主确认,4-待货主付款,5-付款待确认,6-待邮寄发票,7-待平台付款,8-已完结,9-已驳回", example = "1")
+    private Integer statusCode;
 
-    @ApiModelProperty(value = "状态", example = "1")
-    private Integer status;
+    @ApiModelProperty(value = "状态Msg 1-待锁定,2-待对账,3-待货主确认,4-待货主付款,5-付款待确认,6-待邮寄发票,7-待平台付款,8-已完结,9-已驳回", example = "待锁定")
+    private String statusMsg;
 
     @ApiModelProperty(value = "合并结算单时间", example = "2023-01-01 00:00:00")
     private String mergeTime;

performance-web/src/main/java/com/clx/performance/struct/SettlementOwnerStruct.java

 package com.clx.performance.struct;
 
+import com.clx.performance.enums.SettlementOwnerEnum;
 import com.clx.performance.model.SettlementOwner;
 import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
-@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {SettlementOwnerEnum.class, DateUtils.class})
 public interface SettlementOwnerStruct {
 
-
+    @Mapping(target = "invoiceTypeCode", source = "invoiceType")
+    @Mapping(target = "invoiceTypeMsg", expression = "java(SettlementOwnerEnum.InvoiceType.getMsgByCode(settlementOwner.getInvoiceType()))")
+    @Mapping(target = "invoiceStatusCode", source = "invoiceStatus")
+    @Mapping(target = "invoiceStatusMsg", expression = "java(SettlementOwnerEnum.InvoiceStatus.getMsgByCode(settlementOwner.getInvoiceStatus()))")
+    @Mapping(target = "statusCode", source = "status")
+    @Mapping(target = "statusMsg", expression = "java(SettlementOwnerEnum.Status.getMsgByCode(settlementOwner.getStatus()))")
     CarrierSettlementOwnerDetailVO convert(SettlementOwner settlementOwner);
 
 }