소스 검색

add enums

hr~ 2 일 전
부모
커밋
cd1a4c7696

+ 27 - 0
product-common/src/main/java/com/poyee/enums/AddressTypeEnum.java

@@ -0,0 +1,27 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum AddressTypeEnum {
+    SELLER(1,"卖家"),
+    BUYER(2, "买家"),;
+
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    AddressTypeEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public static AddressTypeEnum fromCode(int code) {
+        for (AddressTypeEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown from source code: " + code);
+    }
+
+}

+ 26 - 0
product-common/src/main/java/com/poyee/enums/FromSourceEnum.java

@@ -0,0 +1,26 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum FromSourceEnum {
+    ECO_SALE(1, "生态购"),
+    RECYCLE(2, "回收"),
+    IDLE(3, "闲置");
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    FromSourceEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public static FromSourceEnum fromCode(int code) {
+        for (FromSourceEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown from source code: " + code);
+    }
+}

+ 25 - 0
product-common/src/main/java/com/poyee/enums/ItemSpecEnum.java

@@ -0,0 +1,25 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum ItemSpecEnum {
+    BOX(1, "箱"),
+    CASE(2, "盒");
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    ItemSpecEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public static ItemSpecEnum fromCode(int code) {
+        for (ItemSpecEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown item spec code: " + code);
+    }
+}

+ 25 - 0
product-common/src/main/java/com/poyee/enums/ItemStatusEnum.java

@@ -0,0 +1,25 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum ItemStatusEnum {
+    ON_SHELF(1, "上架"),
+    OFF_SHELF(2, "下架");
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    ItemStatusEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public static ItemStatusEnum fromCode(int code) {
+        for (ItemStatusEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown item status code: " + code);
+    }
+}

+ 25 - 0
product-common/src/main/java/com/poyee/enums/ItemTypeEnum.java

@@ -0,0 +1,25 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum ItemTypeEnum {
+    FLASH_SALE(1, "闪购"),
+    IDLE(2, "闲置");
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    ItemTypeEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public static ItemTypeEnum fromCode(int code) {
+        for (ItemTypeEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown item type code: " + code);
+    }
+}

+ 26 - 0
product-common/src/main/java/com/poyee/enums/PermissionEnum.java

@@ -0,0 +1,26 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum PermissionEnum {
+    ALL(1, "全部"),
+    MERCHANT(2, "商家"),
+    USER(3, "用户");
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    PermissionEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public static PermissionEnum fromCode(int code) {
+        for (PermissionEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown permission code: " + code);
+    }
+}

+ 27 - 0
product-common/src/main/java/com/poyee/enums/ProductStatusEnum.java

@@ -0,0 +1,27 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum ProductStatusEnum {
+    PENDING_REVIEW(10, "待审核"),
+    ON_SHELF(20, "已上架"),
+    OFF_SHELF(30, "下架"),
+    REJECTED(40, "拒绝");
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    ProductStatusEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public static ProductStatusEnum fromCode(int code) {
+        for (ProductStatusEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown product status code: " + code);
+    }
+}

+ 12 - 24
product-common/src/main/java/com/poyee/enums/ProductTypeEnum.java

@@ -1,37 +1,25 @@
 package com.poyee.enums;
 
-import com.poyee.res.ProductTypeRes;
 import lombok.Getter;
 
-import java.util.Arrays;
-import java.util.List;
-
 public enum ProductTypeEnum {
+    STAR_CARD(1, "球星卡"),
+    OTHER(2, "其他");
 
-    TRADING_CARD(1, "球星卡"),
-    OTHER(2, "其他"),
-    ;
     @Getter
-    final int code;
+    private final int code;
     @Getter
-    final String name;
+    private final String description;
 
-    ProductTypeEnum(int code, String name) {
+    ProductTypeEnum(int code, String description) {
         this.code = code;
-        this.name = name;
-    }
-
-    public static List<ProductTypeRes> getAll() {
-        return Arrays.stream(ProductTypeEnum.values())
-                .map(value -> ProductTypeRes.builder().code(value.code).name(value.name).build())
-                .collect(java.util.stream.Collectors.toList());
+        this.description = description;
     }
 
-
-    public static ProductTypeEnum getByCode(int code) {
-        return Arrays.stream(ProductTypeEnum.values())
-                .filter(value -> value.code == code)
-                .findFirst()
-                .orElse(null);
+    public static ProductTypeEnum fromCode(int code) {
+        for (ProductTypeEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown product type code: " + code);
     }
-}
+}

+ 11 - 14
product-common/src/main/java/com/poyee/enums/SaleTypeEnum.java

@@ -2,27 +2,24 @@ package com.poyee.enums;
 
 import lombok.Getter;
 
-import java.util.Arrays;
-
 public enum SaleTypeEnum {
-    SPOT_TRADING(1, "现货"),
-    PRESALE(2, "预售");
+    SPOT(1, "现货"),
+    PRE_SALE(2, "预售");
 
     @Getter
-    final int code;
+    private final int code;
     @Getter
-    final String name;
+    private final String description;
 
-    SaleTypeEnum(int code, String name) {
+    SaleTypeEnum(int code, String description) {
         this.code = code;
-        this.name = name;
+        this.description = description;
     }
 
-    public static String getName(int code) {
-        return Arrays.stream(values())
-                .filter(v -> v.code == code)
-                .map(v -> v.name)
-                .findFirst()
-                .orElse(null);
+    public static SaleTypeEnum fromCode(int code) {
+        for (SaleTypeEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown sale type code: " + code);
     }
 }

+ 39 - 0
product-common/src/main/java/com/poyee/enums/SalesOrderStatusEnum.java

@@ -0,0 +1,39 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum SalesOrderStatusEnum {
+    PENDING_PAYMENT(1001, "待支付"),              // 订单已创建,等待用户支付
+    PENDING_SHIPMENT(1002, "待发货"),            // 订单已处理,等待卖家发货
+    SHIPPED(1003, "已发货"),                     // 订单已发货,等待买家确认收货
+    COMPLETED(1004, "订单完成"),                 // 买家已确认收货,交易完成
+
+    // 退款相关状态(2001-2004)
+    REFUND_PENDING(2001, "退款审核中"),          // 用户发起退款,等待商家审核(闲置订单特有)
+    REFUND_PROCESSING(2002, "退款中"),           // 订单正在处理退款,用户资金等待银行确认
+    REFUND_COMPLETED(2003, "退款完成"),          // 订单已完成退款,用户资金已到账
+    REFUND_FAILED(2004, "退款失败"),             // 订单退款失败,用户资金未到账
+
+    // 异常状态
+    EXPIRED(3001, "订单超时");                   // 用户未在规定时间内完成操作,系统自动取消订单
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    SalesOrderStatusEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+
+    public static SalesOrderStatusEnum fromCode(int code) {
+        for (SalesOrderStatusEnum status : values()) {
+            if (status.code == code) {
+                return status;
+            }
+        }
+        throw new IllegalArgumentException("Unknown order status code: " + code);
+    }
+}

+ 25 - 0
product-common/src/main/java/com/poyee/enums/WhetherEnum.java

@@ -0,0 +1,25 @@
+package com.poyee.enums;
+
+import lombok.Getter;
+
+public enum WhetherEnum {
+    YES(1, "是"),
+    NO(0, "否");
+
+    @Getter
+    private final int code;
+    @Getter
+    private final String description;
+
+    WhetherEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public static WhetherEnum fromCode(int code) {
+        for (WhetherEnum e : values()) {
+            if (e.code == code) return e;
+        }
+        throw new IllegalArgumentException("Unknown whether code: " + code);
+    }
+}

+ 7 - 7
product-web/src/main/java/com/poyee/facade/impl/ProductInfoFacade.java

@@ -41,7 +41,7 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static com.poyee.enums.ProductTypeEnum.getByCode;
+import static com.poyee.enums.ProductTypeEnum.fromCode;
 
 @Component
 @AllArgsConstructor
@@ -100,12 +100,12 @@ public class ProductInfoFacade implements IProductInfoFacade {
     @Override
     public ProductDetailRes detail(String sku) {
         ProductInfo productInfo = productInfo(sku);
-        ProductTypeEnum productTypeEnum = getByCode(productInfo.getProductType());
+        ProductTypeEnum productTypeEnum = fromCode(productInfo.getProductType());
         ProductMedia productMedia = productMediaService.lambdaQuery().eq(ProductMedia::getRelationSku, productInfo.getSku()).one();
         Assert.notNull(productMedia, "the_product_image_does_not_exist");
         List<String> otherImages = StrUtil.isNotBlank(productMedia.getOtherImages()) ?
                 Arrays.asList(productMedia.getOtherImages().split(",")) : Lists.newArrayList();
-        if (Objects.equals(productTypeEnum, ProductTypeEnum.TRADING_CARD)) {
+        if (Objects.equals(productTypeEnum, ProductTypeEnum.STAR_CARD)) {
             CardAttribute cardAttribute = cardAttributeService.lambdaQuery().eq(CardAttribute::getRelationSku, productInfo.getSku()).one();
             Assert.notNull(cardAttribute, "The_product_attribute_does_not_exist");
             return ProductDetailRes.builder()
@@ -207,7 +207,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
 
         if (Objects.isNull(existingFastSale)) {
             ProductFastSale newFastSale = ProductFastSale.builder()
-                    .saleType(Objects.nonNull(fastSaleReq.getSaleTime()) ? SaleTypeEnum.PRESALE.getCode() : SaleTypeEnum.SPOT_TRADING.getCode())
+                    .saleType(Objects.nonNull(fastSaleReq.getSaleTime()) ? SaleTypeEnum.PRE_SALE.getCode() : SaleTypeEnum.SPOT.getCode())
                     .sku(fastSaleReq.getSku())
                     .recycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode())
                     .recycleInventory(fastSaleReq.getRecycleInventory())
@@ -219,7 +219,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
             productInfo.setFastSaleFlag(StatusEnum.TRUE.getCode());
             return this.productInfoService.updateById(productInfo);
         } else {
-            existingFastSale.setSaleType(Objects.nonNull(fastSaleReq.getSaleTime()) ? SaleTypeEnum.PRESALE.getCode() : SaleTypeEnum.SPOT_TRADING.getCode());
+            existingFastSale.setSaleType(Objects.nonNull(fastSaleReq.getSaleTime()) ? SaleTypeEnum.PRE_SALE.getCode() : SaleTypeEnum.SPOT.getCode());
             existingFastSale.setRecycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode());
             existingFastSale.setRecycleInventory(fastSaleReq.getRecycleInventory());
             existingFastSale.setSaleTime(fastSaleReq.getSaleTime());
@@ -232,13 +232,13 @@ public class ProductInfoFacade implements IProductInfoFacade {
     @Transactional
     @Override
     public Boolean add(ProductInfoAddReq productInfoAddReq) {
-        ProductTypeEnum productTypeEnum = getByCode(productInfoAddReq.getProductType());
+        ProductTypeEnum productTypeEnum = fromCode(productInfoAddReq.getProductType());
         sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PRODUCT_TYPE, StrUtil.toString(productInfoAddReq.getProductType()));
         sysDictDataService.validateOptions(ProductConstant.DICT_KEY_LABEL, StrUtil.toString(productInfoAddReq.getLabelKey()));
         String sku = SKU_PREFIX + IdUtil.getSnowflakeNextId() % 1000000000000000000L;
         ProductInfo productInfo;
         switch (productTypeEnum) {
-            case TRADING_CARD:
+            case STAR_CARD:
                 CardAttribute cardAttribute = CardAttribute.builder()
                         .year(productInfoAddReq.getYear())
                         .sport(productInfoAddReq.getSport())

+ 6 - 3
product-web/src/main/java/com/poyee/facade/impl/ProductItemFacade.java

@@ -9,6 +9,9 @@ import com.github.pagehelper.PageInfo;
 import com.poyee.constant.ProductConstant;
 import com.poyee.domain.ProductInfo;
 import com.poyee.domain.ProductItem;
+import com.poyee.enums.FromSourceEnum;
+import com.poyee.enums.ItemStatusEnum;
+import com.poyee.enums.ItemTypeEnum;
 import com.poyee.facade.IProductItemFacade;
 import com.poyee.mapstruct.ProductItemMapstruct;
 import com.poyee.req.OrderServiceProductItemSearchReq;
@@ -79,10 +82,10 @@ public class ProductItemFacade implements IProductItemFacade {
         ProductItem productItem = ProductItem.builder()
                 .relationSku(productInfo.getSku())
                 .productName(productInfo.getProductName())
-                .itemType(1)//闪购
-                .fromSource(1) //生态购
+                .itemType(ItemTypeEnum.FLASH_SALE.getCode())
+                .fromSource(FromSourceEnum.ECO_SALE.getCode())
                 .itemSpec(productItemSearchReq.getSpec())
-                .status(2)//下架
+                .status(ItemStatusEnum.OFF_SHELF.getCode())
                 .itemPrice(productItemSearchReq.getPrice())
                 .inventory(productItemSearchReq.getInventory())
                 .frozenInventory(0)