Commit db73ddc942fc34427b659e053ea0858ba64246fe
1 parent
8ed52701
REVIEW 物流配送管理表
Showing
5 changed files
with
16 additions
and
14 deletions
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; | @@ -14,11 +14,13 @@ import java.util.Arrays; | ||
| 14 | @AllArgsConstructor | 14 | @AllArgsConstructor |
| 15 | @Getter | 15 | @Getter |
| 16 | public enum DeliveryExpressChargeModeEnum implements IntArrayValuable { | 16 | public enum DeliveryExpressChargeModeEnum implements IntArrayValuable { |
| 17 | - BY_PIECE(1, "按件"), | ||
| 18 | - BY_WEIGHT(2,"按重量"), | ||
| 19 | - BY_VOLUME(3, "按体积"); | 17 | + |
| 18 | + PIECE(1, "按件"), | ||
| 19 | + WEIGHT(2,"按重量"), | ||
| 20 | + VOLUME(3, "按体积"); | ||
| 20 | 21 | ||
| 21 | public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DeliveryExpressChargeModeEnum::getType).toArray(); | 22 | public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DeliveryExpressChargeModeEnum::getType).toArray(); |
| 23 | + | ||
| 22 | /** | 24 | /** |
| 23 | * 类型 | 25 | * 类型 |
| 24 | */ | 26 | */ |
| @@ -32,4 +34,5 @@ public enum DeliveryExpressChargeModeEnum implements IntArrayValuable { | @@ -32,4 +34,5 @@ public enum DeliveryExpressChargeModeEnum implements IntArrayValuable { | ||
| 32 | public int[] array() { | 34 | public int[] array() { |
| 33 | return ARRAYS; | 35 | return ARRAYS; |
| 34 | } | 36 | } |
| 37 | + | ||
| 35 | } | 38 | } |
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; | @@ -16,6 +16,7 @@ import lombok.Data; | ||
| 16 | @KeySequence("trade_delivery_express_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | 16 | @KeySequence("trade_delivery_express_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 17 | @Data | 17 | @Data |
| 18 | public class DeliveryExpressDO extends BaseDO { | 18 | public class DeliveryExpressDO extends BaseDO { |
| 19 | + | ||
| 19 | /** | 20 | /** |
| 20 | * 编号,自增 | 21 | * 编号,自增 |
| 21 | */ | 22 | */ |
| @@ -33,7 +34,7 @@ public class DeliveryExpressDO extends BaseDO { | @@ -33,7 +34,7 @@ public class DeliveryExpressDO extends BaseDO { | ||
| 33 | private String name; | 34 | private String name; |
| 34 | 35 | ||
| 35 | /** | 36 | /** |
| 36 | - * 快递公司logo | 37 | + * 快递公司 logo |
| 37 | */ | 38 | */ |
| 38 | private String logo; | 39 | private String logo; |
| 39 | 40 | ||
| @@ -49,4 +50,4 @@ public class DeliveryExpressDO extends BaseDO { | @@ -49,4 +50,4 @@ public class DeliveryExpressDO extends BaseDO { | ||
| 49 | */ | 50 | */ |
| 50 | private Integer status; | 51 | private Integer status; |
| 51 | 52 | ||
| 52 | -} | ||
| 53 | \ No newline at end of file | 53 | \ No newline at end of file |
| 54 | +} |
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 { | @@ -29,9 +29,8 @@ public class DeliveryExpressTemplateChargeDO extends BaseDO { | ||
| 29 | */ | 29 | */ |
| 30 | private Long templateId; | 30 | private Long templateId; |
| 31 | 31 | ||
| 32 | - // TODO @Jason:全国最好使用 0 @芋艿 Area.ID_CHINA 是 1 | ||
| 33 | /** | 32 | /** |
| 34 | - * 配送区域id 1:适用于全国 | 33 | + * 配送区域 |
| 35 | */ | 34 | */ |
| 36 | private Integer areaId; | 35 | private Integer areaId; |
| 37 | 36 |
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; | @@ -7,12 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId; | ||
| 7 | import com.baomidou.mybatisplus.annotation.TableName; | 7 | import com.baomidou.mybatisplus.annotation.TableName; |
| 8 | import lombok.*; | 8 | import lombok.*; |
| 9 | 9 | ||
| 10 | -// TODO @Jason:配送放到 trade 里。然后属于 deliver 配送;配送分成两个方式:1)快递 express;2)自提 pickup; | ||
| 11 | -// 这样的话,实体名字一个是 DeliveryExpressTemplateDO;长一点没关系哈;还有一个 DeliveryPickUpStoreDO 自提门店; | ||
| 12 | -// 表名的话,还是加上 trade_delivery_ 前缀,主要归属在交易域 | ||
| 13 | - | ||
| 14 | -// TODO @Jason:额外补充,不是这个类哈。应该还有个快递;DeliveryExpress;需要设计下这个表 | ||
| 15 | - | ||
| 16 | /** | 10 | /** |
| 17 | * 快递运费模板 DO | 11 | * 快递运费模板 DO |
| 18 | * | 12 | * |
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; | @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; | ||
| 7 | import com.baomidou.mybatisplus.annotation.TableName; | 7 | import com.baomidou.mybatisplus.annotation.TableName; |
| 8 | import lombok.Data; | 8 | import lombok.Data; |
| 9 | 9 | ||
| 10 | +// TODO @芋艿:后续再详细 review 一轮 | ||
| 10 | /** | 11 | /** |
| 11 | * 自提门店店员 DO | 12 | * 自提门店店员 DO |
| 12 | * | 13 | * |
| @@ -16,6 +17,7 @@ import lombok.Data; | @@ -16,6 +17,7 @@ import lombok.Data; | ||
| 16 | @KeySequence("trade_delivery_pick_up_store_staff_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | 17 | @KeySequence("trade_delivery_pick_up_store_staff_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 17 | @Data | 18 | @Data |
| 18 | public class DeliveryPickUpStoreStaffDO extends BaseDO { | 19 | public class DeliveryPickUpStoreStaffDO extends BaseDO { |
| 20 | + | ||
| 19 | /** | 21 | /** |
| 20 | * 编号,自增 | 22 | * 编号,自增 |
| 21 | */ | 23 | */ |
| @@ -24,6 +26,8 @@ public class DeliveryPickUpStoreStaffDO extends BaseDO { | @@ -24,6 +26,8 @@ public class DeliveryPickUpStoreStaffDO extends BaseDO { | ||
| 24 | 26 | ||
| 25 | /** | 27 | /** |
| 26 | * 自提门店编号 | 28 | * 自提门店编号 |
| 29 | + * | ||
| 30 | + * 关联 {@link DeliveryPickUpStoreDO#getId()} | ||
| 27 | */ | 31 | */ |
| 28 | private Long storeId; | 32 | private Long storeId; |
| 29 | 33 | ||
| @@ -40,4 +44,5 @@ public class DeliveryPickUpStoreStaffDO extends BaseDO { | @@ -40,4 +44,5 @@ public class DeliveryPickUpStoreStaffDO extends BaseDO { | ||
| 40 | * 枚举 {@link CommonStatusEnum} | 44 | * 枚举 {@link CommonStatusEnum} |
| 41 | */ | 45 | */ |
| 42 | private Integer status; | 46 | private Integer status; |
| 43 | -} | ||
| 44 | \ No newline at end of file | 47 | \ No newline at end of file |
| 48 | + | ||
| 49 | +} |