From db73ddc942fc34427b659e053ea0858ba64246fe Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 16 May 2023 19:17:25 +0800 Subject: [PATCH] =?UTF-8?q?REVIEW=20=E7=89=A9=E6=B5=81=E9=85=8D=E9=80=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/delivery/DeliveryExpressChargeModeEnum.java | 9 ++++++--- .../trade/dal/dataobject/delivery/DeliveryExpressDO.java | 5 +++-- .../delivery/DeliveryExpressTemplateChargeDO.java | 3 +-- .../dataobject/delivery/DeliveryExpressTemplateDO.java | 6 ------ .../dataobject/delivery/DeliveryPickUpStoreStaffDO.java | 7 ++++++- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java index 2a2a45ee4e..8ac37e3829 100644 --- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java +++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java @@ -14,11 +14,13 @@ import java.util.Arrays; @AllArgsConstructor @Getter public enum DeliveryExpressChargeModeEnum implements IntArrayValuable { - BY_PIECE(1, "按件"), - BY_WEIGHT(2,"按重量"), - BY_VOLUME(3, "按体积"); + + PIECE(1, "按件"), + WEIGHT(2,"按重量"), + VOLUME(3, "按体积"); public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DeliveryExpressChargeModeEnum::getType).toArray(); + /** * 类型 */ @@ -32,4 +34,5 @@ public enum DeliveryExpressChargeModeEnum implements IntArrayValuable { public int[] array() { return ARRAYS; } + } diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java index 4adab07ffc..604ce225bf 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressDO.java @@ -16,6 +16,7 @@ import lombok.Data; @KeySequence("trade_delivery_express_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data public class DeliveryExpressDO extends BaseDO { + /** * 编号，自增 */ @@ -33,7 +34,7 @@ public class DeliveryExpressDO extends BaseDO { private String name; /** - * 快递公司logo + * 快递公司 logo */ private String logo; @@ -49,4 +50,4 @@ public class DeliveryExpressDO extends BaseDO { */ private Integer status; -} \ No newline at end of file +} diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateChargeDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateChargeDO.java index 17912f15b1..803576503d 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateChargeDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateChargeDO.java @@ -29,9 +29,8 @@ public class DeliveryExpressTemplateChargeDO extends BaseDO { */ private Long templateId; - // TODO @Jason：全国最好使用 0 @芋艿 Area.ID_CHINA 是 1 /** - * 配送区域id 1:适用于全国 + * 配送区域 */ private Integer areaId; diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateDO.java index b542f77023..b6d6db3b77 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateDO.java @@ -7,12 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; -// TODO @Jason：配送放到 trade 里。然后属于 deliver 配送；配送分成两个方式：1）快递 express；2）自提 pickup； -// 这样的话，实体名字一个是 DeliveryExpressTemplateDO；长一点没关系哈；还有一个 DeliveryPickUpStoreDO 自提门店； -// 表名的话，还是加上 trade_delivery_ 前缀，主要归属在交易域 - -// TODO @Jason：额外补充，不是这个类哈。应该还有个快递；DeliveryExpress；需要设计下这个表 - /** * 快递运费模板 DO * diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreStaffDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreStaffDO.java index 3bec270de3..a1a2196caf 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreStaffDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreStaffDO.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +// TODO @芋艿：后续再详细 review 一轮 /** * 自提门店店员 DO * @@ -16,6 +17,7 @@ import lombok.Data; @KeySequence("trade_delivery_pick_up_store_staff_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data public class DeliveryPickUpStoreStaffDO extends BaseDO { + /** * 编号，自增 */ @@ -24,6 +26,8 @@ public class DeliveryPickUpStoreStaffDO extends BaseDO { /** * 自提门店编号 + * + * 关联 {@link DeliveryPickUpStoreDO#getId()} */ private Long storeId; @@ -40,4 +44,5 @@ public class DeliveryPickUpStoreStaffDO extends BaseDO { * 枚举 {@link CommonStatusEnum} */ private Integer status; -} \ No newline at end of file + +}